Convert wgopenbsd to use netip.Prefix

Author: mrmelon54

internal/wgopenbsd/client_openbsd.go

@@ -8,6 +8,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"net"
+	"net/netip"
 	"os"
 	"runtime"
 	"time"
@@ -201,7 +202,7 @@ func parseDevice(name string, ifio *wgh.WGInterfaceIO) (*wgtypes.Device, error)
 
 		// Same idea, we know how many allowed IPs we need to account for, so
 		// reserve the space and advance the pointer through each WGAIP structure.
-		p.AllowedIPs = make([]net.IPNet, 0, peer.Aips_count)
+		p.AllowedIPs = make([]netip.Prefix, 0, peer.Aips_count)
 		for j := uintptr(0); j < uintptr(peer.Aips_count); j++ {
 			aip := (*wgh.WGAIPIO)(unsafe.Pointer(
 				uintptr(unsafe.Pointer(peer)) + wgh.SizeofWGPeerIO + j*wgh.SizeofWGAIPIO,
@@ -283,21 +284,15 @@ func parsePeer(pio *wgh.WGPeerIO) wgtypes.Peer {
 }
 
 // parseAllowedIP unpacks a net.IPNet from a WGAIP structure.
-func parseAllowedIP(aip *wgh.WGAIPIO) net.IPNet {
+func parseAllowedIP(aip *wgh.WGAIPIO) netip.Prefix {
 	switch aip.Af {
 	case unix.AF_INET:
-		return net.IPNet{
-			IP:   net.IP(aip.Addr[:net.IPv4len]),
-			Mask: net.CIDRMask(int(aip.Cidr), 32),
-		}
+		return netip.PrefixFrom(netip.AddrFrom4([4]byte(aip.Addr[:4])), int(aip.Cidr))
 	case unix.AF_INET6:
-		return net.IPNet{
-			IP:   net.IP(aip.Addr[:]),
-			Mask: net.CIDRMask(int(aip.Cidr), 128),
-		}
+		return netip.PrefixFrom(netip.AddrFrom16(aip.Addr), int(aip.Cidr))
 	default:
 		panicf("wgopenbsd: invalid address family for allowed IP: %+v", aip)
-		return net.IPNet{}
+		return netip.Prefix{}
 	}
 }
 

internal/wgopenbsd/client_openbsd_test.go

@@ -5,7 +5,7 @@ package wgopenbsd
 
 import (
 	"errors"
-	"net"
+	"net/netip"
 	"os"
 	"testing"
 	"time"
@@ -239,20 +239,20 @@ func TestClientDeviceBasic(t *testing.T) {
 				ReceiveBytes:                2,
 				TransmitBytes:               1,
 				LastHandshakeTime:           time.Unix(1, 2),
-				AllowedIPs: []net.IPNet{
-					wgtest.MustCIDR("192.168.1.0/24"),
-					wgtest.MustCIDR("fd00::/64"),
+				AllowedIPs: []netip.Prefix{
+					netip.MustParsePrefix("192.168.1.0/24"),
+					netip.MustParsePrefix("fd00::/64"),
 				},
 				ProtocolVersion: 1,
 			},
 			{
 				PublicKey:  peerB,
 				Endpoint:   wgtest.MustUDPAddr("[::1]:2048"),
-				AllowedIPs: []net.IPNet{wgtest.MustCIDR("2001:db8::1/128")},
+				AllowedIPs: []netip.Prefix{netip.MustParsePrefix("2001:db8::1/128")},
 			},
 			{
 				PublicKey:  peerC,
-				AllowedIPs: []net.IPNet{},
+				AllowedIPs: []netip.Prefix{},
 			},
 		},
 	}