net/netaddr: start migrating to net/netip via new netaddr adapter package

Updates #5162

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

wgengine/monitor/monitor.go

@@ -14,8 +14,8 @@ import (
 	"sync"
 	"time"
 
-	"inet.af/netaddr"
 	"tailscale.com/net/interfaces"
+	"tailscale.com/net/netaddr"
 	"tailscale.com/types/logger"
 )
 

wgengine/monitor/monitor_darwin.go

@@ -11,7 +11,7 @@ import (
 
 	"golang.org/x/net/route"
 	"golang.org/x/sys/unix"
-	"inet.af/netaddr"
+	"tailscale.com/net/netaddr"
 	"tailscale.com/types/logger"
 )
 
@@ -190,7 +190,7 @@ func fmtAddr(a route.Addr) any {
 	if a == nil {
 		return nil
 	}
-	if ip := ipOfAddr(a); !ip.IsZero() {
+	if ip := ipOfAddr(a); ip.IsValid() {
 		return ip
 	}
 	switch a := a.(type) {

wgengine/monitor/monitor_linux.go

@@ -14,8 +14,8 @@ import (
 	"github.com/jsimonetti/rtnetlink"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
-	"inet.af/netaddr"
 	"tailscale.com/envknob"
+	"tailscale.com/net/netaddr"
 	"tailscale.com/net/tsaddr"
 	"tailscale.com/types/logger"
 )
@@ -167,7 +167,7 @@ func (c *nlConn) Receive() (message, error) {
 
 		if msg.Header.Type == unix.RTM_NEWROUTE &&
 			(rmsg.Attributes.Table == 255 || rmsg.Attributes.Table == 254) &&
-			(dst.IP().IsMulticast() || dst.IP().IsLinkLocalUnicast()) {
+			(dst.Addr().IsMulticast() || dst.Addr().IsLinkLocalUnicast()) {
 
 			if debugNetlinkMessages {
 				c.logf("%s ignored", typeStr)
@@ -180,7 +180,7 @@ func (c *nlConn) Receive() (message, error) {
 		if rmsg.Table == tsTable && dst.IsSingleIP() {
 			// Don't log. Spammy and normal to see a bunch of these on start-up,
 			// which we make ourselves.
-		} else if tsaddr.IsTailscaleIP(dst.IP()) {
+		} else if tsaddr.IsTailscaleIP(dst.Addr()) {
 			// Verbose only.
 			c.logf("%s: [v1] src=%v, dst=%v, gw=%v, outif=%v, table=%v", typeStr,
 				condNetAddrPrefix(src), condNetAddrPrefix(dst), condNetAddrIP(gw),
@@ -246,14 +246,14 @@ func netaddrIPPrefix(std net.IP, bits uint8) netaddr.IPPrefix {
 }
 
 func condNetAddrPrefix(ipp netaddr.IPPrefix) string {
-	if ipp.IP().IsZero() {
+	if !ipp.Addr().IsValid() {
 		return ""
 	}
 	return ipp.String()
 }
 
 func condNetAddrIP(ip netaddr.IP) string {
-	if ip.IsZero() {
+	if !ip.IsValid() {
 		return ""
 	}
 	return ip.String()
@@ -269,7 +269,7 @@ type newRouteMessage struct {
 const tsTable = 52
 
 func (m *newRouteMessage) ignore() bool {
-	return m.Table == tsTable || tsaddr.IsTailscaleIP(m.Dst.IP())
+	return m.Table == tsTable || tsaddr.IsTailscaleIP(m.Dst.Addr())
 }
 
 // newAddrMessage is a message for a new address being added.

wgengine/monitor/monitor_linux_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/jsimonetti/rtnetlink"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
-	"inet.af/netaddr"
+	"tailscale.com/net/netaddr"
 )
 
 func newAddrMsg(iface uint32, addr string, typ netlink.HeaderType) netlink.Message {

wgengine/monitor/monitor_windows.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
-	"inet.af/netaddr"
+	"tailscale.com/net/netaddr"
 	"tailscale.com/net/tsaddr"
 	"tailscale.com/types/logger"
 )
@@ -144,7 +144,7 @@ func (m *winMon) unicastAddressChanged(_ winipcfg.MibNotificationType, row *wini
 func (m *winMon) routeChanged(_ winipcfg.MibNotificationType, row *winipcfg.MibIPforwardRow2) {
 	what := "route"
 	ipn := row.DestinationPrefix.IPNet()
-	if cidr, ok := netaddr.FromStdIPNet(&ipn); ok && tsaddr.IsTailscaleIP(cidr.IP()) {
+	if cidr, ok := netaddr.FromStdIPNet(&ipn); ok && tsaddr.IsTailscaleIP(cidr.Addr()) {
 		what = "tsroute"
 	}
 	// start a goroutine to finish our work, to return to Windows out of this callback