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

Reuse the connection

Browse Source
This commit is contained in:
Owen
2025-07-23 14:49:24 -07:00
parent b58e7c9fad
commit 3ad36f95e1
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
common.go
View File

@@ -222,29 +222,11 @@ func resolveDomain(domain string) (string, error) {
return ipAddr, nil return ipAddr, nil
} }
func sendUDPHolePunch(serverAddr string, olmID string, sourcePort uint16) error { func sendUDPHolePunchWithConn(conn *net.UDPConn, remoteAddr *net.UDPAddr, olmID string) error {
if gerbilServerPubKey == "" || olmToken == "" { if gerbilServerPubKey == "" || olmToken == "" {
return nil return nil
} }
// Bind to specific local port
localAddr := &net.UDPAddr{
Port: int(sourcePort),
IP: net.IPv4zero,
}
remoteAddr, err := net.ResolveUDPAddr("udp", serverAddr)
if err != nil {
return fmt.Errorf("failed to resolve UDP address: %v", err)
}
conn, err := net.ListenUDP("udp", localAddr)
if err != nil {
return fmt.Errorf("failed to bind UDP socket: %v", err)
}
defer conn.Close()
payload := struct { payload := struct {
OlmID string `json:"olmId"` OlmID string `json:"olmId"`
Token string `json:"token"` Token string `json:"token"`
@@ -275,7 +257,7 @@ func sendUDPHolePunch(serverAddr string, olmID string, sourcePort uint16) error
return fmt.Errorf("failed to send UDP packet: %v", err) return fmt.Errorf("failed to send UDP packet: %v", err)
} }
logger.Debug("Sent UDP hole punch to %s: %s", serverAddr, string(jsonData)) logger.Debug("Sent UDP hole punch to %s: %s", remoteAddr.String(), string(jsonData))
return nil return nil
} }
@@ -340,8 +322,29 @@ func keepSendingUDPHolePunch(endpoint string, olmID string, sourcePort uint16) {
return return
} }
serverAddr := host + ":21820"
// Create the UDP connection once and reuse it
localAddr := &net.UDPAddr{
Port: int(sourcePort),
IP: net.IPv4zero,
}
remoteAddr, err := net.ResolveUDPAddr("udp", serverAddr)
if err != nil {
logger.Error("Failed to resolve UDP address: %v", err)
return
}
conn, err := net.ListenUDP("udp", localAddr)
if err != nil {
logger.Error("Failed to bind UDP socket: %v", err)
return
}
defer conn.Close()
// Execute once immediately before starting the loop // Execute once immediately before starting the loop
if err := sendUDPHolePunch(host+":21820", olmID, sourcePort); err != nil { if err := sendUDPHolePunchWithConn(conn, remoteAddr, olmID); err != nil {
logger.Error("Failed to send UDP hole punch: %v", err) logger.Error("Failed to send UDP hole punch: %v", err)
} }
@@ -354,7 +357,7 @@ func keepSendingUDPHolePunch(endpoint string, olmID string, sourcePort uint16) {
logger.Info("Stopping UDP holepunch") logger.Info("Stopping UDP holepunch")
return return
case <-ticker.C: case <-ticker.C:
if err := sendUDPHolePunch(host+":21820", olmID, sourcePort); err != nil { if err := sendUDPHolePunchWithConn(conn, remoteAddr, olmID); err != nil {
logger.Error("Failed to send UDP hole punch: %v", err) logger.Error("Failed to send UDP hole punch: %v", err)
} }
} }