libtailscale: fix regression in interface address enumeration

raggi · raggi · commit be6a0d728261 · 2025-09-26T12:19:46.000-07:00
Fix regression introduced in 9c933a0. Fixes tailscale/tailscale#16836
diff --git a/libtailscale/net.go b/libtailscale/net.go
@@ -101,9 +101,12 @@ func (a *App) getInterfaces() ([]netmon.Interface, error) {
 
 		addrs := strings.Trim(fields[1], " \n")
 		for _, addr := range strings.Split(addrs, " ") {
-			_, ipnet, err := net.ParseCIDR(addr)
+			pfx, err := netip.ParsePrefix(addr)
 			if err == nil {
-				newIf.AltAddrs = append(newIf.AltAddrs, ipnet)
+				newIf.AltAddrs = append(newIf.AltAddrs, &net.IPAddr{
+					IP:   net.IP(pfx.Addr().AsSlice()),
+					Zone: pfx.Addr().Zone(),
+				})
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,12 @@ func (a *App) getInterfaces() ([]netmon.Interface, error) {`
`101`	`101`
`102`	`102`	`addrs := strings.Trim(fields[1], " \n")`
`103`	`103`	`for _, addr := range strings.Split(addrs, " ") {`
`104`		`- _, ipnet, err := net.ParseCIDR(addr)`
	`104`	`+ pfx, err := netip.ParsePrefix(addr)`
`105`	`105`	`if err == nil {`
`106`		`- newIf.AltAddrs = append(newIf.AltAddrs, ipnet)`
	`106`	`+ newIf.AltAddrs = append(newIf.AltAddrs, &net.IPAddr{`
	`107`	`+ IP: net.IP(pfx.Addr().AsSlice()),`
	`108`	`+ Zone: pfx.Addr().Zone(),`
	`109`	`+ })`
`107`	`110`	`}`
`108`	`111`	`}`
`109`	`112`