WIP

peer/hubpoller.go

@@ -5,21 +5,26 @@ import (
 	"io"
 	"log"
 	"net/http"
+	"net/netip"
 	"net/url"
 	"time"
 	"vppn/m"
+
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 type HubPoller struct {
 	Globals
-	client   *http.Client
-	req      *http.Request
-	versions [256]int64
-	netName  string
+	holePunch *HolePunch
+	client    *http.Client
+	req       *http.Request
+	versions  [256]int64
+	netName   string
 }
 
 func NewHubPoller(
 	g Globals,
+	hp *HolePunch,
 	netName,
 	hubURL,
 	apiKey string,
@@ -40,10 +45,11 @@ func NewHubPoller(
 	req.SetBasicAuth("", apiKey)
 
 	return &HubPoller{
-		Globals: g,
-		client:  client,
-		req:     req,
-		netName: netName,
+		Globals:   g,
+		holePunch: hp,
+		client:    client,
+		req:       req,
+		netName:   netName,
 	}, nil
 }
 
@@ -98,14 +104,45 @@ func (hp *HubPoller) applyNetworkState(state m.NetworkState) {
 		if i == int(hp.LocalPeerIP) {
 			continue
 		}
-
 		if peer != nil && peer.Version == hp.versions[i] {
 			continue
 		}
-
-		hp.RemotePeers[i].Load().HandlePeerUpdate(peerUpdateMsg{Peer: state.Peers[i]})
+		hp.applyPeerConfig(peer)
 		if peer != nil {
 			hp.versions[i] = peer.Version
 		}
 	}
 }
+
+func (hp *HubPoller) applyPeerConfig(peer *m.Peer) {
+	if peer == nil || len(peer.WGPubKey) != wgtypes.KeyLen {
+		return
+	}
+	if len(peer.PublicIP1) == 0 || peer.Port1 == 0 {
+		return
+	}
+
+	pubKey, err := wgtypes.NewKey(peer.WGPubKey)
+	if err != nil {
+		hp.logf("Invalid WG key for peer %d: %v", peer.PeerIP, err)
+		return
+	}
+
+	ip, ok := netip.AddrFromSlice(peer.PublicIP1)
+	if !ok {
+		hp.logf("Invalid public IP for peer %d", peer.PeerIP)
+		return
+	}
+	endpoint := netip.AddrPortFrom(ip.Unmap(), peer.Port1)
+
+	if peer.Relay {
+		if err := applyBaseConfig(hp.WGClient, hp.WGDevName, pubKey, endpoint, hp.Network); err != nil {
+			hp.logf("Failed to update relay config: %v", err)
+		}
+		return
+	}
+
+	if hp.holePunch != nil {
+		hp.holePunch.OnEndpointLearned(peer.PeerIP, pubKey, endpoint, true)
+	}
+}