Migrating get/set-listener to netip.AddrPort

TODO.md

@@ -29,6 +29,7 @@
             - [x] Rework uhppote-cli::command Device
             - [x] Rework uhppoted-httpd::controller EndPoint
             - [ ] Rework GetListenerResponse to use AddrPort
+                  - Remove types.Listener `// FIXME remove (unused)`
 
       - [ ] CLI get-devices EOF
             ```

encoding/UTO311-L0x/UT0311-L0x.go

@@ -143,7 +143,7 @@ func marshal(s reflect.Value, bytes []byte) error {
 							if !v[1].IsNil() {
 								return v[1].Interface().(error)
 							} else if slice := v[0].Bytes(); len(slice) != 6 {
-								return fmt.Errorf("Invalid IPv4 address:port %v", slice)
+								return fmt.Errorf("invalid IPv4 address:port %v", slice)
 							} else {
 								copy(bytes[offset:offset+6], slice)
 							}

types/listener.go

@@ -5,11 +5,12 @@ import (
 	"net"
 )
 
+// FIXME remove (unused)
 type Listener struct {
 	SerialNumber SerialNumber
 	Address      net.UDPAddr
 }
 
 func (l *Listener) String() string {
-	return fmt.Sprintf("%s %s", l.SerialNumber, l.Address.String())
+	return fmt.Sprintf("%v %v", l.SerialNumber, l.Address)
 }

uhppote/get_listener.go

@@ -2,27 +2,27 @@ package uhppote
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/uhppoted/uhppote-core/messages"
 	"github.com/uhppoted/uhppote-core/types"
 )
 
-func (u *uhppote) GetListener(serialNumber uint32) (*types.Listener, error) {
+func (u *uhppote) GetListener(serialNumber uint32) (netip.AddrPort, error) {
 	if serialNumber == 0 {
-		return nil, fmt.Errorf("invalid device ID (%v)", serialNumber)
+		return netip.AddrPort{}, fmt.Errorf("invalid device ID (%v)", serialNumber)
 	}
 
 	request := messages.GetListenerRequest{
 		SerialNumber: types.SerialNumber(serialNumber),
 	}
 
 	if reply, err := sendto[messages.GetListenerResponse](u, serialNumber, request); err != nil {
-		return nil, err
+		return netip.AddrPort{}, err
 	} else {
-		return &types.Listener{
-			SerialNumber: reply.SerialNumber,
-			Address:      net.UDPAddr{IP: reply.Address, Port: int(reply.Port)},
-		}, nil
+		addr := reply.Address.To4()
+		slice := [4]byte{addr[0], addr[1], addr[2], addr[3]}
+
+		return netip.AddrPortFrom(netip.AddrFrom4(slice), reply.Port), nil
 	}
 }

uhppote/iuhppote.go

@@ -14,7 +14,7 @@ type IUHPPOTE interface {
 	GetDevice(deviceID uint32) (*types.Device, error)
 
 	SetAddress(deviceID uint32, address, mask, gateway net.IP) (*types.Result, error)
-	GetListener(deviceID uint32) (*types.Listener, error)
+	GetListener(deviceID uint32) (netip.AddrPort, error)
 	SetListener(deviceID uint32, address net.UDPAddr) (*types.Result, error)
 	GetTime(deviceID uint32) (*types.Time, error)
 	SetTime(deviceID uint32, datetime time.Time) (*types.Time, error)