WIP

peer/hubpoller.go

@@ -1,3 +1,5 @@
+//go:build ignore
+
 package peer
 
 import (
@@ -14,17 +16,13 @@ import (
 )
 
 type HubPoller struct {
-	Globals
-	holePunch *HolePunch
-	client    *http.Client
-	req       *http.Request
-	versions  [256]int64
-	netName   string
+	client   *http.Client
+	req      *http.Request
+	versions [256]int64
+	netName  string
 }
 
 func NewHubPoller(
-	g Globals,
-	hp *HolePunch,
 	netName,
 	hubURL,
 	apiKey string,
@@ -118,7 +116,7 @@ func (hp *HubPoller) applyPeerConfig(peer *m.Peer) {
 	if peer == nil || len(peer.WGPubKey) != wgtypes.KeyLen {
 		return
 	}
-	if len(peer.PublicIP1) == 0 || peer.Port1 == 0 {
+	if len(peer.Addr4) == 0 || peer.Port4 == 0 {
 		return
 	}
 
@@ -128,12 +126,12 @@ func (hp *HubPoller) applyPeerConfig(peer *m.Peer) {
 		return
 	}
 
-	ip, ok := netip.AddrFromSlice(peer.PublicIP1)
+	ip, ok := netip.AddrFromSlice(peer.Addr4)
 	if !ok {
 		hp.logf("Invalid public IP for peer %d", peer.PeerIP)
 		return
 	}
-	endpoint := netip.AddrPortFrom(ip.Unmap(), peer.Port1)
+	endpoint := netip.AddrPortFrom(ip.Unmap(), peer.Port4)
 
 	if peer.Relay {
 		if err := applyBaseConfig(hp.WGClient, hp.WGDevName, pubKey, endpoint, hp.Network); err != nil {