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>

wgengine/wgcfg/config.go

@@ -6,7 +6,8 @@
 package wgcfg
 
 import (
-	"tailscale.com/net/netaddr"
+	"net/netip"
+
 	"tailscale.com/types/key"
 )
 
@@ -17,16 +18,16 @@ import (
 type Config struct {
 	Name       string
 	PrivateKey key.NodePrivate
-	Addresses  []netaddr.IPPrefix
+	Addresses  []netip.Prefix
 	MTU        uint16
-	DNS        []netaddr.IP
+	DNS        []netip.Addr
 	Peers      []Peer
 }
 
 type Peer struct {
 	PublicKey           key.NodePublic
 	DiscoKey            key.DiscoPublic // present only so we can handle restarts within wgengine, not passed to WireGuard
-	AllowedIPs          []netaddr.IPPrefix
+	AllowedIPs          []netip.Prefix
 	PersistentKeepalive uint16
 	// wireguard-go's endpoint for this peer. It should always equal Peer.PublicKey.
 	// We represent it explicitly so that we can detect if they diverge and recover.

wgengine/wgcfg/device_test.go

@@ -19,7 +19,6 @@ import (
 	"golang.zx2c4.com/wireguard/conn"
 	"golang.zx2c4.com/wireguard/device"
 	"golang.zx2c4.com/wireguard/tun"
-	"tailscale.com/net/netaddr"
 	"tailscale.com/types/key"
 )
 
@@ -42,7 +41,7 @@ func TestDeviceConfig(t *testing.T) {
 		PrivateKey: pk1,
 		Peers: []Peer{{
 			PublicKey:  k2,
-			AllowedIPs: []netaddr.IPPrefix{ip2},
+			AllowedIPs: []netip.Prefix{ip2},
 		}},
 	}
 
@@ -50,7 +49,7 @@ func TestDeviceConfig(t *testing.T) {
 		PrivateKey: pk2,
 		Peers: []Peer{{
 			PublicKey:           k1,
-			AllowedIPs:          []netaddr.IPPrefix{ip1},
+			AllowedIPs:          []netip.Prefix{ip1},
 			PersistentKeepalive: 5,
 		}},
 	}
@@ -143,7 +142,7 @@ func TestDeviceConfig(t *testing.T) {
 	t.Run("device1 add new peer", func(t *testing.T) {
 		cfg1.Peers = append(cfg1.Peers, Peer{
 			PublicKey:  k3,
-			AllowedIPs: []netaddr.IPPrefix{ip3},
+			AllowedIPs: []netip.Prefix{ip3},
 		})
 		sort.Slice(cfg1.Peers, func(i, j int) bool {
 			return cfg1.Peers[i].PublicKey.Less(cfg1.Peers[j].PublicKey)

wgengine/wgcfg/nmcfg/nmcfg.go

@@ -8,9 +8,9 @@ package nmcfg
 import (
 	"bytes"
 	"fmt"
+	"net/netip"
 	"strings"
 
-	"tailscale.com/net/netaddr"
 	"tailscale.com/net/tsaddr"
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/logger"
@@ -34,7 +34,7 @@ func nodeDebugName(n *tailcfg.Node) string {
 
 // cidrIsSubnet reports whether cidr is a non-default-route subnet
 // exported by node that is not one of its own self addresses.
-func cidrIsSubnet(node *tailcfg.Node, cidr netaddr.IPPrefix) bool {
+func cidrIsSubnet(node *tailcfg.Node, cidr netip.Prefix) bool {
 	if cidr.Bits() == 0 {
 		return false
 	}

wgengine/wgcfg/parser.go

@@ -9,11 +9,11 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"net/netip"
 	"strconv"
 	"strings"
 
 	"go4.org/mem"
-	"tailscale.com/net/netaddr"
 	"tailscale.com/types/key"
 )
 
@@ -163,7 +163,7 @@ func (cfg *Config) handlePeerLine(peer *Peer, k, value mem.RO, valueBytes []byte
 		}
 		peer.PersistentKeepalive = uint16(n)
 	case k.EqualString("allowed_ip"):
-		ipp := netaddr.IPPrefix{}
+		ipp := netip.Prefix{}
 		err := ipp.UnmarshalText(valueBytes)
 		if err != nil {
 			return err

wgengine/wgcfg/parser_test.go

@@ -13,7 +13,6 @@ import (
 	"runtime"
 	"testing"
 
-	"tailscale.com/net/netaddr"
 	"tailscale.com/types/key"
 )
 
@@ -72,7 +71,7 @@ func BenchmarkFromUAPI(b *testing.B) {
 
 	peer := Peer{
 		PublicKey:  k1,
-		AllowedIPs: []netaddr.IPPrefix{ip1},
+		AllowedIPs: []netip.Prefix{ip1},
 	}
 	cfg1 := &Config{
 		PrivateKey: pk1,

wgengine/wgcfg/writer.go

@@ -7,9 +7,9 @@ package wgcfg
 import (
 	"fmt"
 	"io"
+	"net/netip"
 	"strconv"
 
-	"tailscale.com/net/netaddr"
 	"tailscale.com/types/key"
 	"tailscale.com/types/logger"
 )
@@ -101,7 +101,7 @@ func (cfg *Config) ToUAPI(logf logger.Logf, w io.Writer, prev *Config) error {
 	return stickyErr
 }
 
-func cidrsEqual(x, y []netaddr.IPPrefix) bool {
+func cidrsEqual(x, y []netip.Prefix) bool {
 	// TODO: re-implement using netaddr.IPSet.Equal.
 	if len(x) != len(y) {
 		return false
@@ -119,7 +119,7 @@ func cidrsEqual(x, y []netaddr.IPPrefix) bool {
 	}
 
 	// Otherwise, see if they're the same, but out of order.
-	m := make(map[netaddr.IPPrefix]bool)
+	m := make(map[netip.Prefix]bool)
 	for _, v := range x {
 		m[v] = true
 	}