From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 23 May 2023 10:55:30 +0000 (+1000)
Subject: go1.19 compatibility
X-Git-Url: http://www.git.stargrave.org/?p=btrtrc.git;a=commitdiff_plain;h=b18e824a6b9f549bce05e117b1355172d14ef3b3

go1.19 compatibility
---

diff --git a/netip-addrport.go b/netip-addrport.go
index a57ea206..e438db70 100644
--- a/netip-addrport.go
+++ b/netip-addrport.go
@@ -17,7 +17,7 @@ func ipv4AddrPortFromKrpcNodeAddr(na krpc.NodeAddr) (_ netip.AddrPort, err error
 		err = fmt.Errorf("not an ipv4 address: %v", na.IP)
 		return
 	}
-	addr := netip.AddrFrom4([4]byte(ip4))
+	addr := netip.AddrFrom4(*(*[4]byte)(ip4))
 	addrPort := netip.AddrPortFrom(addr, uint16(na.Port))
 	return addrPort, nil
 }
@@ -28,7 +28,7 @@ func ipv6AddrPortFromKrpcNodeAddr(na krpc.NodeAddr) (_ netip.AddrPort, err error
 		err = fmt.Errorf("not an ipv4 address: %v", na.IP)
 		return
 	}
-	addr := netip.AddrFrom16([16]byte(ip6))
+	addr := netip.AddrFrom16(*(*[16]byte)(ip6))
 	addrPort := netip.AddrPortFrom(addr, uint16(na.Port))
 	return addrPort, nil
 }
diff --git a/peer_protocol/handshake.go b/peer_protocol/handshake.go
index 454cc246..a6f648cf 100644
--- a/peer_protocol/handshake.go
+++ b/peer_protocol/handshake.go
@@ -70,7 +70,7 @@ func (pex PeerExtensionBits) String() string {
 			pex.SetBit(bitTag.bit, false)
 		}
 	}
-	unknownCount := bits.OnesCount64(*(*uint64)((unsafe.Pointer(unsafe.SliceData(pex[:])))))
+	unknownCount := bits.OnesCount64(*(*uint64)((unsafe.Pointer(&pex[0]))))
 	if unknownCount != 0 {
 		tags = append(tags, fmt.Sprintf("%v unknown", unknownCount))
 	}
diff --git a/peer_protocol/ut-holepunch/ut-holepunch.go b/peer_protocol/ut-holepunch/ut-holepunch.go
index f7a586a6..3051fc04 100644
--- a/peer_protocol/ut-holepunch/ut-holepunch.go
+++ b/peer_protocol/ut-holepunch/ut-holepunch.go
@@ -54,13 +54,13 @@ func (m *Msg) UnmarshalBinary(b []byte) error {
 	var addr netip.Addr
 	switch addrType {
 	case Ipv4:
-		addr = netip.AddrFrom4([4]byte(b[:4]))
+		addr = netip.AddrFrom4(*(*[4]byte)(b[:4]))
 		b = b[4:]
 	case Ipv6:
 		if len(b) < 22 {
 			return fmt.Errorf("not enough bytes")
 		}
-		addr = netip.AddrFrom16([16]byte(b[:16]))
+		addr = netip.AddrFrom16(*(*[16]byte)(b[:16]))
 		b = b[16:]
 	default:
 		return fmt.Errorf("unhandled addr type value %v", addrType)
diff --git a/pexconn.go b/pexconn.go
index cc6c3fc6..459131f4 100644
--- a/pexconn.go
+++ b/pexconn.go
@@ -108,13 +108,13 @@ func (s *pexConnState) updateRemoteLiveConns(rx pp.PexMsg) (errs []error) {
 		delete(s.remoteLiveConns, addrPort)
 	}
 	for i, added := range rx.Added {
-		addr := netip.AddrFrom4([4]byte(added.IP.To4()))
+		addr := netip.AddrFrom4(*(*[4]byte)(added.IP.To4()))
 		addrPort := netip.AddrPortFrom(addr, uint16(added.Port))
 		flags := g.SliceGet(rx.AddedFlags, i)
 		g.MakeMapIfNilAndSet(&s.remoteLiveConns, addrPort, flags)
 	}
 	for i, added := range rx.Added6 {
-		addr := netip.AddrFrom16([16]byte(added.IP.To16()))
+		addr := netip.AddrFrom16(*(*[16]byte)(added.IP.To16()))
 		addrPort := netip.AddrPortFrom(addr, uint16(added.Port))
 		flags := g.SliceGet(rx.Added6Flags, i)
 		g.MakeMapIfNilAndSet(&s.remoteLiveConns, addrPort, flags)