Convert wgwindows to use netip.Prefix

Author: mrmelon54

internal/wgwindows/client_windows.go

@@ -2,6 +2,7 @@ package wgwindows
 
 import (
 	"net"
+	"net/netip"
 	"os"
 	"time"
 	"unsafe"
@@ -209,19 +210,14 @@ func (c *Client) Device(name string) (*wgtypes.Device, error) {
 			} else {
 				a = a.NextAllowedIP()
 			}
-			var ip net.IP
-			var bits int
-			if a.AddressFamily == windows.AF_INET {
-				ip = a.Address[:4]
-				bits = 32
-			} else if a.AddressFamily == windows.AF_INET6 {
-				ip = a.Address[:16]
-				bits = 128
+			var prefix netip.Prefix
+			switch a.AddressFamily {
+			case windows.AF_INET:
+				prefix = netip.PrefixFrom(netip.AddrFrom4([4]byte(a.Address[:4])), int(a.Cidr))
+			case windows.AF_INET6:
+				prefix = netip.PrefixFrom(netip.AddrFrom16(a.Address), int(a.Cidr))
 			}
-			peer.AllowedIPs = append(peer.AllowedIPs, net.IPNet{
-				IP:   ip,
-				Mask: net.CIDRMask(int(a.Cidr), bits),
-			})
+			peer.AllowedIPs = append(peer.AllowedIPs, prefix)
 		}
 		device.Peers = append(device.Peers, peer)
 	}
@@ -276,7 +272,7 @@ func (c *Client) ConfigureDevice(name string, cfg wgtypes.Config) error {
 		}
 		if cfg.Peers[i].Endpoint != nil {
 			peer.Flags |= ioctl.PeerHasEndpoint
-			peer.Endpoint.SetIP(cfg.Peers[i].Endpoint.IP, uint16(cfg.Peers[i].Endpoint.Port))
+			peer.Endpoint.SetAddrPort(cfg.Peers[i].Endpoint.AddrPort())
 		}
 		if cfg.Peers[i].PersistentKeepaliveInterval != nil {
 			peer.Flags |= ioctl.PeerHasPersistentKeepalive
@@ -285,20 +281,21 @@ func (c *Client) ConfigureDevice(name string, cfg wgtypes.Config) error {
 		b.AppendPeer(peer)
 		for j := range cfg.Peers[i].AllowedIPs {
 			var family ioctl.AddressFamily
-			var ip net.IP
-			if ip = cfg.Peers[i].AllowedIPs[j].IP.To4(); ip != nil {
+			prefix := cfg.Peers[i].AllowedIPs[j]
+
+			// Unmap 4in6 addresses to maintain previous compatibility
+			addr := prefix.Addr().Unmap()
+			switch {
+			case addr.Is4():
 				family = windows.AF_INET
-			} else if ip = cfg.Peers[i].AllowedIPs[j].IP.To16(); ip != nil {
+			case addr.Is6():
 				family = windows.AF_INET6
-			} else {
-				ip = cfg.Peers[i].AllowedIPs[j].IP
 			}
-			cidr, _ := cfg.Peers[i].AllowedIPs[j].Mask.Size()
 			a := &ioctl.AllowedIP{
 				AddressFamily: family,
-				Cidr:          uint8(cidr),
+				Cidr:          uint8(prefix.Bits()),
 			}
-			copy(a.Address[:], ip)
+			copy(a.Address[:], addr.AsSlice())
 			b.AppendAllowedIP(a)
 		}
 	}

internal/wgwindows/internal/ioctl/winipcfg_windows.go

@@ -8,6 +8,7 @@ package ioctl
 import (
 	"encoding/binary"
 	"net"
+	"net/netip"
 	"unsafe"
 
 	"golang.org/x/sys/windows"
@@ -33,26 +34,26 @@ func htons(i uint16) uint16 {
 	return *(*uint16)(unsafe.Pointer(&b[0]))
 }
 
-// SetIP method sets family, address, and port to the given IPv4 or IPv6 address and port.
+// SetAddrPort method sets family, address, and port to the given IPv4 or IPv6 address and port.
 // All other members of the structure are set to zero.
-func (addr *RawSockaddrInet) SetIP(ip net.IP, port uint16) error {
-	if v4 := ip.To4(); v4 != nil {
+func (addr *RawSockaddrInet) SetAddrPort(addrPort netip.AddrPort) error {
+	a := addrPort.Addr().Unmap()
+	switch {
+	case a.Is4():
 		addr4 := (*windows.RawSockaddrInet4)(unsafe.Pointer(addr))
 		addr4.Family = windows.AF_INET
-		copy(addr4.Addr[:], v4)
-		addr4.Port = htons(port)
+		addr4.Addr = a.As4()
+		addr4.Port = htons(addrPort.Port())
 		for i := 0; i < 8; i++ {
 			addr4.Zero[i] = 0
 		}
 		return nil
-	}
-
-	if v6 := ip.To16(); v6 != nil {
+	case a.Is6():
 		addr6 := (*windows.RawSockaddrInet6)(unsafe.Pointer(addr))
 		addr6.Family = windows.AF_INET6
-		addr6.Port = htons(port)
+		addr6.Port = htons(addrPort.Port())
 		addr6.Flowinfo = 0
-		copy(addr6.Addr[:], v6)
+		addr6.Addr = a.As16()
 		addr6.Scope_id = 0
 		return nil
 	}