all: convert more code to use net/netip directly

perl -i -npe 's,netaddr.IPPrefixFrom,netip.PrefixFrom,' $(git grep -l -F netaddr.)
    perl -i -npe 's,netaddr.IPPortFrom,netip.AddrPortFrom,' $(git grep -l -F netaddr. )
    perl -i -npe 's,netaddr.IPPrefix,netip.Prefix,g' $(git grep -l -F netaddr. )
    perl -i -npe 's,netaddr.IPPort,netip.AddrPort,g' $(git grep -l -F netaddr. )
    perl -i -npe 's,netaddr.IP\b,netip.Addr,g' $(git grep -l -F netaddr. )
    perl -i -npe 's,netaddr.IPv6Raw\b,netip.AddrFrom16,g' $(git grep -l -F netaddr. )
    goimports -w .

Then delete some stuff from the net/netaddr shim package which is no
longer neeed.

Updates #5162

Change-Id: Ia7a86893fe21c7e3ee1ec823e8aba288d4566cd8
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>

tstest/integration/vms/derive_bindhost_test.go

@@ -6,11 +6,11 @@ package vms
 
 import (
 	"io"
+	"net/netip"
 	"runtime"
 	"testing"
 
 	"tailscale.com/net/interfaces"
-	"tailscale.com/net/netaddr"
 )
 
 func deriveBindhost(t *testing.T) string {
@@ -22,7 +22,7 @@ func deriveBindhost(t *testing.T) string {
 	}
 
 	var ret string
-	err = interfaces.ForeachInterfaceAddress(func(i interfaces.Interface, prefix netaddr.IPPrefix) {
+	err = interfaces.ForeachInterfaceAddress(func(i interfaces.Interface, prefix netip.Prefix) {
 		if ret != "" || i.Name != ifName {
 			return
 		}

tstest/integration/vms/harness_test.go

@@ -26,7 +26,6 @@ import (
 
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/proxy"
-	"tailscale.com/net/netaddr"
 	"tailscale.com/tailcfg"
 	"tailscale.com/tstest/integration"
 	"tailscale.com/tstest/integration/testcontrol"
@@ -43,7 +42,7 @@ type Harness struct {
 	signer         ssh.Signer
 	cs             *testcontrol.Server
 	loginServerURL string
-	testerV4       netaddr.IP
+	testerV4       netip.Addr
 	ipMu           *sync.Mutex
 	ipMap          map[string]ipMapping
 }
@@ -240,6 +239,6 @@ outer:
 	h.testerV4 = bytes2Netaddr(h.Tailscale(t, "ip", "-4"))
 }
 
-func bytes2Netaddr(inp []byte) netaddr.IP {
+func bytes2Netaddr(inp []byte) netip.Addr {
 	return netip.MustParseAddr(string(bytes.TrimSpace(inp)))
 }

tstest/integration/vms/vms_steps_test.go

@@ -13,12 +13,12 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"net/netip"
 	"strings"
 	"testing"
 	"time"
 
 	"golang.org/x/crypto/ssh"
-	"tailscale.com/net/netaddr"
 )
 
 const timeout = 15 * time.Second
@@ -40,7 +40,7 @@ func retry(t *testing.T, fn func() error) {
 	t.Fatalf("tried %d times, got: %v", tries, err)
 }
 
-func (h *Harness) testPing(t *testing.T, ipAddr netaddr.IP, cli *ssh.Client) {
+func (h *Harness) testPing(t *testing.T, ipAddr netip.Addr, cli *ssh.Client) {
 	retry(t, func() error {
 		sess := getSession(t, cli)
 		cmd := fmt.Sprintf("tailscale ping --verbose %s", ipAddr)
@@ -85,7 +85,7 @@ func getSession(t *testing.T, cli *ssh.Client) *ssh.Session {
 	return sess
 }
 
-func (h *Harness) testOutgoingTCP(t *testing.T, ipAddr netaddr.IP, cli *ssh.Client) {
+func (h *Harness) testOutgoingTCP(t *testing.T, ipAddr netip.Addr, cli *ssh.Client) {
 	const sendmsg = "this is a message that curl won't print"
 	ctx, cancel := context.WithCancel(context.Background())
 	s := &http.Server{

tstest/integration/vms/vms_test.go

@@ -29,7 +29,6 @@ import (
 	expect "github.com/tailscale/goexpect"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/sync/semaphore"
-	"tailscale.com/net/netaddr"
 	"tailscale.com/tstest"
 	"tailscale.com/tstest/integration"
 	"tailscale.com/types/logger"
@@ -441,7 +440,7 @@ func (h *Harness) testDistro(t *testing.T, d Distro, ipm ipMapping) {
 
 	for _, tt := range []struct {
 		ipProto string
-		addr    netaddr.IP
+		addr    netip.Addr
 	}{
 		{"ipv4", h.testerV4},
 	} {