pangolin_mirror/olm
1
0
Fork 0
mirror of https://github.com/fosrl/olm.git synced 2026-03-01 08:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ipv6 issue

Browse Source
This commit is contained in:
Owen
2025-09-01 17:16:43 -07:00
parent 5dbfeaa95e
commit 8c71647802
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common.go
View File

@@ -372,7 +372,7 @@ func keepSendingUDPHolePunchToMultipleExitNodes(exitNodes []ExitNode, olmID stri
continue continue
} }
serverAddr := host + ":21820" serverAddr := net.JoinHostPort(host, "21820")
remoteAddr, err := net.ResolveUDPAddr("udp", serverAddr) remoteAddr, err := net.ResolveUDPAddr("udp", serverAddr)
if err != nil { if err != nil {
logger.Error("Failed to resolve UDP address for %s: %v", exitNode.Endpoint, err) logger.Error("Failed to resolve UDP address for %s: %v", exitNode.Endpoint, err)
@@ -442,7 +442,7 @@ func keepSendingUDPHolePunch(endpoint string, olmID string, sourcePort uint16, s
return return
} }
serverAddr := host + ":21820" serverAddr := net.JoinHostPort(host, "21820")
// Create the UDP connection once and reuse it // Create the UDP connection once and reuse it
localAddr := &net.UDPAddr{ localAddr := &net.UDPAddr{
@@ -613,7 +613,7 @@ func ConfigurePeer(dev *device.Device, siteConfig SiteConfig, privateKey wgtypes
// Set up peer monitoring // Set up peer monitoring
if peerMonitor != nil { if peerMonitor != nil {
monitorAddress := strings.Split(siteConfig.ServerIP, "/")[0] monitorAddress := strings.Split(siteConfig.ServerIP, "/")[0]
monitorPeer := fmt.Sprintf("%s:%d", monitorAddress, siteConfig.ServerPort+1) // +1 for the monitor port monitorPeer := net.JoinHostPort(monitorAddress, strconv.Itoa(int(siteConfig.ServerPort+1))) // +1 for the monitor port
logger.Debug("Setting up peer monitor for site %d at %s", siteConfig.SiteId, monitorPeer) logger.Debug("Setting up peer monitor for site %d at %s", siteConfig.SiteId, monitorPeer)
primaryRelay, err := resolveDomain(endpoint) // Using global endpoint variable primaryRelay, err := resolveDomain(endpoint) // Using global endpoint variable