WIP

peer/remote.go

@@ -7,6 +7,7 @@ import (
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 
 	"vppn/peer/control"
+	"vppn/peer/wginterface"
 )
 
 type PeerState string
@@ -18,27 +19,53 @@ const (
 )
 
 type Peer struct {
-	PubKey           wgtypes.Key    // WireGuard public key.
-	VPNIP            netip.Addr     // VPN IP address.
-	IsRelay          bool           // Peer is a relay.
-	IsPublic         bool           // Peer has a public IP.
-	Endpoint4        netip.AddrPort // Reported IPv4 endpoint.
-	Endpoint6        netip.AddrPort // Reported IPv6 endpoint.
-	ObservedEndpoint netip.AddrPort // If we're public: WG handshake source endpoint.
-	LastPing         time.Time      // Time of last ping received.
-	RTT              time.Duration  // Round-trip time.
-	Role             control.Role   // Client initiates pings; server responds.
-	State            PeerState      // Current connection state.
-	Up               bool           // Is the peer alive.
-	WGEndpoint       netip.AddrPort // Endpoint currently in WG (direct/probe).
+	wgPeer    wgtypes.Peer
+	VPNIP     netip.Addr     // VPN IP address.
+	IsRelay   bool           // Peer is a relay.
+	IsPublic  bool           // Peer has a public IP.
+	Endpoint4 netip.AddrPort // Reported IPv4 endpoint.
+	Endpoint6 netip.AddrPort // Reported IPv6 endpoint.
+	RTT       time.Duration  // Round-trip time.
+	Role      control.Role   // Client initiates pings; server responds.
 }
 
-func (p *Peer) Alive() bool {
-	return time.Since(p.LastPing) < TimeoutInterval
+// PubKey is the wireguard public key.
+func (p *Peer) PubKey() wgtypes.Key {
+	return p.wgPeer.PublicKey
+}
+
+func (p *Peer) State() PeerState {
+	if len(p.wgPeer.AllowedIPs) > 0 {
+		return StateDirect
+	}
+	if p.wgPeer.Endpoint == nil {
+		return StateRelayed
+	}
+	return StateProbing
+}
+
+func (p *Peer) WGEndpoint() netip.AddrPort {
+	ep := p.wgPeer.Endpoint
+	if ep == nil {
+		return netip.AddrPort{}
+	}
+	addr, ok := netip.AddrFromSlice(ep.IP)
+	if !ok {
+		return netip.AddrPort{}
+	}
+	return netip.AddrPortFrom(addr.Unmap(), uint16(ep.Port))
+}
+
+func (p *Peer) LastHandshakeTime() time.Time {
+	return p.wgPeer.LastHandshakeTime
+}
+
+func (p *Peer) Up() bool {
+	return time.Since(p.wgPeer.LastHandshakeTime) < wginterface.SessionTimeout
 }
 
 func (p *Peer) CanRelay() bool {
-	return p.IsRelay && p.Up && p.WGEndpoint.IsValid()
+	return p.IsRelay && p.Up()
 }
 
 func (p *Peer) PreferredEndpoint() netip.AddrPort {