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

Fix small bugs =

Browse Source
This commit is contained in:
Owen
2025-12-07 12:05:27 -05:00
parent 2a60de4f1f
commit 02c838eb86
3 changed files with 71 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
config.go
View File

@@ -40,7 +40,7 @@ type OlmConfig struct {
PingTimeout string `json:"pingTimeout"` PingTimeout string `json:"pingTimeout"`
// Advanced // Advanced
Holepunch bool `json:"holepunch"` DisableHolepunch bool `json:"disableHolepunch"`
TlsClientCert string `json:"tlsClientCert"` TlsClientCert string `json:"tlsClientCert"`
OverrideDNS bool `json:"overrideDNS"` OverrideDNS bool `json:"overrideDNS"`
DisableRelay bool `json:"disableRelay"` DisableRelay bool `json:"disableRelay"`
@@ -87,7 +87,7 @@ func DefaultConfig() *OlmConfig {
SocketPath: socketPath, SocketPath: socketPath,
PingInterval: "3s", PingInterval: "3s",
PingTimeout: "5s", PingTimeout: "5s",
Holepunch: false, DisableHolepunch: false,
// DoNotCreateNewClient: false, // DoNotCreateNewClient: false,
sources: make(map[string]string), sources: make(map[string]string),
} }
@@ -103,7 +103,7 @@ func DefaultConfig() *OlmConfig {
config.sources["socketPath"] = string(SourceDefault) config.sources["socketPath"] = string(SourceDefault)
config.sources["pingInterval"] = string(SourceDefault) config.sources["pingInterval"] = string(SourceDefault)
config.sources["pingTimeout"] = string(SourceDefault) config.sources["pingTimeout"] = string(SourceDefault)
config.sources["holepunch"] = string(SourceDefault) config.sources["disableHolepunch"] = string(SourceDefault)
config.sources["overrideDNS"] = string(SourceDefault) config.sources["overrideDNS"] = string(SourceDefault)
config.sources["disableRelay"] = string(SourceDefault) config.sources["disableRelay"] = string(SourceDefault)
// config.sources["doNotCreateNewClient"] = string(SourceDefault) // config.sources["doNotCreateNewClient"] = string(SourceDefault)
@@ -253,9 +253,9 @@ func loadConfigFromEnv(config *OlmConfig) {
config.SocketPath = val config.SocketPath = val
config.sources["socketPath"] = string(SourceEnv) config.sources["socketPath"] = string(SourceEnv)
} }
if val := os.Getenv("HOLEPUNCH"); val == "true" { if val := os.Getenv("DISABLE_HOLEPUNCH"); val == "true" {
config.Holepunch = true config.DisableHolepunch = true
config.sources["holepunch"] = string(SourceEnv) config.sources["disableHolepunch"] = string(SourceEnv)
} }
if val := os.Getenv("OVERRIDE_DNS"); val == "true" { if val := os.Getenv("OVERRIDE_DNS"); val == "true" {
config.OverrideDNS = true config.OverrideDNS = true
@@ -292,7 +292,7 @@ func loadConfigFromCLI(config *OlmConfig, args []string) (bool, bool, error) {
"pingInterval": config.PingInterval, "pingInterval": config.PingInterval,
"pingTimeout": config.PingTimeout, "pingTimeout": config.PingTimeout,
"enableApi": config.EnableAPI, "enableApi": config.EnableAPI,
"holepunch": config.Holepunch, "disableHolepunch": config.DisableHolepunch,
"overrideDNS": config.OverrideDNS, "overrideDNS": config.OverrideDNS,
"disableRelay": config.DisableRelay, "disableRelay": config.DisableRelay,
// "doNotCreateNewClient": config.DoNotCreateNewClient, // "doNotCreateNewClient": config.DoNotCreateNewClient,
@@ -315,7 +315,7 @@ func loadConfigFromCLI(config *OlmConfig, args []string) (bool, bool, error) {
serviceFlags.StringVar(&config.PingInterval, "ping-interval", config.PingInterval, "Interval for pinging the server") serviceFlags.StringVar(&config.PingInterval, "ping-interval", config.PingInterval, "Interval for pinging the server")
serviceFlags.StringVar(&config.PingTimeout, "ping-timeout", config.PingTimeout, "Timeout for each ping") serviceFlags.StringVar(&config.PingTimeout, "ping-timeout", config.PingTimeout, "Timeout for each ping")
serviceFlags.BoolVar(&config.EnableAPI, "enable-api", config.EnableAPI, "Enable API server for receiving connection requests") serviceFlags.BoolVar(&config.EnableAPI, "enable-api", config.EnableAPI, "Enable API server for receiving connection requests")
serviceFlags.BoolVar(&config.Holepunch, "holepunch", config.Holepunch, "Enable hole punching") serviceFlags.BoolVar(&config.DisableHolepunch, "disable-holepunch", config.DisableHolepunch, "Disable hole punching")
serviceFlags.BoolVar(&config.OverrideDNS, "override-dns", config.OverrideDNS, "Override system DNS settings") serviceFlags.BoolVar(&config.OverrideDNS, "override-dns", config.OverrideDNS, "Override system DNS settings")
serviceFlags.BoolVar(&config.DisableRelay, "disable-relay", config.DisableRelay, "Disable relay connections") serviceFlags.BoolVar(&config.DisableRelay, "disable-relay", config.DisableRelay, "Disable relay connections")
// serviceFlags.BoolVar(&config.DoNotCreateNewClient, "do-not-create-new-client", config.DoNotCreateNewClient, "Do not create new client") // serviceFlags.BoolVar(&config.DoNotCreateNewClient, "do-not-create-new-client", config.DoNotCreateNewClient, "Do not create new client")
@@ -384,8 +384,8 @@ func loadConfigFromCLI(config *OlmConfig, args []string) (bool, bool, error) {
if config.EnableAPI != origValues["enableApi"].(bool) { if config.EnableAPI != origValues["enableApi"].(bool) {
config.sources["enableApi"] = string(SourceCLI) config.sources["enableApi"] = string(SourceCLI)
} }
if config.Holepunch != origValues["holepunch"].(bool) { if config.DisableHolepunch != origValues["disableHolepunch"].(bool) {
config.sources["holepunch"] = string(SourceCLI) config.sources["disableHolepunch"] = string(SourceCLI)
} }
if config.OverrideDNS != origValues["overrideDNS"].(bool) { if config.OverrideDNS != origValues["overrideDNS"].(bool) {
config.sources["overrideDNS"] = string(SourceCLI) config.sources["overrideDNS"] = string(SourceCLI)
@@ -505,9 +505,9 @@ func mergeConfigs(dest, src *OlmConfig) {
dest.EnableAPI = src.EnableAPI dest.EnableAPI = src.EnableAPI
dest.sources["enableApi"] = string(SourceFile) dest.sources["enableApi"] = string(SourceFile)
} }
if src.Holepunch { if src.DisableHolepunch {
dest.Holepunch = src.Holepunch dest.DisableHolepunch = src.DisableHolepunch
dest.sources["holepunch"] = string(SourceFile) dest.sources["disableHolepunch"] = string(SourceFile)
} }
if src.OverrideDNS { if src.OverrideDNS {
dest.OverrideDNS = src.OverrideDNS dest.OverrideDNS = src.OverrideDNS
@@ -604,7 +604,7 @@ func (c *OlmConfig) ShowConfig() {
// Advanced // Advanced
fmt.Println("\nAdvanced:") fmt.Println("\nAdvanced:")
fmt.Printf(" holepunch = %v [%s]\n", c.Holepunch, getSource("holepunch")) fmt.Printf(" disable-holepunch = %v [%s]\n", c.DisableHolepunch, getSource("disableHolepunch"))
fmt.Printf(" override-dns = %v [%s]\n", c.OverrideDNS, getSource("overrideDNS")) fmt.Printf(" override-dns = %v [%s]\n", c.OverrideDNS, getSource("overrideDNS"))
fmt.Printf(" disable-relay = %v [%s]\n", c.DisableRelay, getSource("disableRelay")) fmt.Printf(" disable-relay = %v [%s]\n", c.DisableRelay, getSource("disableRelay"))
// fmt.Printf(" do-not-create-new-client = %v [%s]\n", c.DoNotCreateNewClient, getSource("doNotCreateNewClient")) // fmt.Printf(" do-not-create-new-client = %v [%s]\n", c.DoNotCreateNewClient, getSource("doNotCreateNewClient"))

2
main.go
View File

@@ -235,7 +235,7 @@ func runOlmMainWithArgs(ctx context.Context, cancel context.CancelFunc, signalCt
DNS: config.DNS, DNS: config.DNS,
UpstreamDNS: config.UpstreamDNS, UpstreamDNS: config.UpstreamDNS,
InterfaceName: config.InterfaceName, InterfaceName: config.InterfaceName,
Holepunch: config.Holepunch, Holepunch: !config.DisableHolepunch,
TlsClientCert: config.TlsClientCert, TlsClientCert: config.TlsClientCert,
PingIntervalDuration: config.PingIntervalDuration, PingIntervalDuration: config.PingIntervalDuration,
PingTimeoutDuration: config.PingTimeoutDuration, PingTimeoutDuration: config.PingTimeoutDuration,

6
olm/olm.go
View File

@@ -778,8 +778,6 @@ func StartTunnel(config TunnelConfig) {
return return
} }
// Add exit node to holepunch rotation if we have a holepunch manager
if holePunchManager != nil {
exitNode := holepunch.ExitNode{ exitNode := holepunch.ExitNode{
Endpoint: handshakeData.ExitNode.Endpoint, Endpoint: handshakeData.ExitNode.Endpoint,
PublicKey: handshakeData.ExitNode.PublicKey, PublicKey: handshakeData.ExitNode.PublicKey,
@@ -792,8 +790,8 @@ func StartTunnel(config TunnelConfig) {
logger.Debug("Exit node %s already in holepunch rotation", exitNode.Endpoint) logger.Debug("Exit node %s already in holepunch rotation", exitNode.Endpoint)
} }
holePunchManager.TriggerHolePunch() // Trigger immediate hole punch attempt
holePunchManager.ResetInterval() // start sending immediately again so we fill in the endpoint on the cloud holePunchManager.ResetInterval() // start sending immediately again so we fill in the endpoint on the cloud
}
// Send handshake acknowledgment back to server with retry // Send handshake acknowledgment back to server with retry
stopPeerSend, _ = olm.SendMessageInterval("olm/wg/server/peer/add", map[string]interface{}{ stopPeerSend, _ = olm.SendMessageInterval("olm/wg/server/peer/add", map[string]interface{}{
@@ -859,7 +857,6 @@ func StartTunnel(config TunnelConfig) {
}) })
olm.OnTokenUpdate(func(token string, exitNodes []websocket.ExitNode) { olm.OnTokenUpdate(func(token string, exitNodes []websocket.ExitNode) {
if holePunchManager != nil {
holePunchManager.SetToken(token) holePunchManager.SetToken(token)
logger.Debug("Got exit nodes for hole punching: %v", exitNodes) logger.Debug("Got exit nodes for hole punching: %v", exitNodes)
@@ -880,7 +877,6 @@ func StartTunnel(config TunnelConfig) {
if err := holePunchManager.StartMultipleExitNodes(hpExitNodes); err != nil { if err := holePunchManager.StartMultipleExitNodes(hpExitNodes); err != nil {
logger.Warn("Failed to start hole punch: %v", err) logger.Warn("Failed to start hole punch: %v", err)
} }
}
}) })
olm.OnAuthError(func(statusCode int, message string) { olm.OnAuthError(func(statusCode int, message string) {