Do not use composition for UDPEndpoint

Signed-off-by: Steffen Vogel <[email protected]>

Author: stv0g

conn_udp.go

@@ -12,11 +12,14 @@ import (
 
 var errInvalidEndpoint = errors.New("invalid endpoint type")
 
-type UDPEndpoint struct {
-	*net.UDPAddr
+type UDPEndpoint net.UDPAddr
+
+func (ep *UDPEndpoint) String() string {
+	addr := (*net.UDPAddr)(ep)
+	return addr.String()
 }
 
-func (ep *UDPEndpoint) Equal(o Endpoint) bool {
+func (ep UDPEndpoint) Equal(o Endpoint) bool {
 	ep2, ok := o.(*UDPEndpoint)
 	if !ok {
 		return false
@@ -78,7 +81,7 @@ func (s *UDPConn) Send(pl payload, spkt spk, ep Endpoint) error {
 		e.typ = msgTypeEmptyData
 	}
 
-	network := networkFromAddr(uep.UDPAddr)
+	network := networkFromAddr((*net.UDPAddr)(uep))
 
 	// Check if we are on DragonFly or OpenBSD systems
 	// which require two independent sockets for listening
@@ -91,7 +94,7 @@ func (s *UDPConn) Send(pl payload, spkt spk, ep Endpoint) error {
 	}
 
 	buf := e.MarshalBinaryAndSeal(spkt)
-	if n, err := conn.WriteToUDP(buf, uep.UDPAddr); err != nil {
+	if n, err := conn.WriteToUDP(buf, (*net.UDPAddr)(uep)); err != nil {
 		return err
 	} else if n != len(buf) {
 		return fmt.Errorf("partial write")
@@ -147,6 +150,6 @@ func receiveFromConn(conn *net.UDPConn) ReceiveFunc {
 			return nil, nil, fmt.Errorf("parsed partial packet")
 		}
 
-		return e.payload, &UDPEndpoint{from}, nil
+		return e.payload, (*UDPEndpoint)(from), nil
 	}
 }

conn_udp_test.go

@@ -16,14 +16,14 @@ func TestUDPConn(t *testing.T) {
 	spk, _, err := generateStaticKeyPair()
 	require.NoError(err)
 
+	ep := net.UDPAddr{
+		IP:   net.IPv6loopback,
+		Port: 1234,
+	}
+
 	p := &peer{
-		spkt: spk,
-		endpoint: &UDPEndpoint{
-			&net.UDPAddr{
-				IP:   net.IPv6loopback,
-				Port: 1234,
-			},
-		},
+		spkt:     spk,
+		endpoint: (*UDPEndpoint)(&ep),
 	}
 
 	c, err := NewUDPConn([]*net.UDPAddr{

peer.go

@@ -51,13 +51,13 @@ func (s *Server) newPeer(cfg PeerConfig) (*peer, error) {
 	p := &peer{
 		server: s,
 
-		initialEndpoint: &UDPEndpoint{cfg.Endpoint},
+		initialEndpoint: (*UDPEndpoint)(cfg.Endpoint),
 		spkt:            cfg.PublicKey,
 		psk:             cfg.PresharedKey,
 	}
 
 	if cfg.Endpoint != nil {
-		p.endpoint = &UDPEndpoint{cfg.Endpoint}
+		p.endpoint = (*UDPEndpoint)(cfg.Endpoint)
 	}
 
 	p.logger = s.logger.With(slog.Any("pid", p.PID()))