From f683afa64767a9d5ca6a64db33ae576d9bcd6bd8 Mon Sep 17 00:00:00 2001 From: miloschwartz Date: Tue, 27 Jan 2026 17:53:34 -0800 Subject: [PATCH 1/2] improve override-dns and tunnel-dns descriptions --- config.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config.go b/config.go index 2e13d6a..910dc4e 100644 --- a/config.go +++ b/config.go @@ -89,6 +89,7 @@ func DefaultConfig() *OlmConfig { PingInterval: "3s", PingTimeout: "5s", DisableHolepunch: false, + OverrideDNS: false, TunnelDNS: false, // DoNotCreateNewClient: false, sources: make(map[string]string), @@ -324,9 +325,9 @@ func loadConfigFromCLI(config *OlmConfig, args []string) (bool, bool, error) { 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.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, "When enabled, the client uses custom DNS servers to resolve internal resources and aliases. This overrides your system's default DNS settings. Queries that cannot be resolved as a Pangolin resource will be forwarded to your configured Upstream DNS Server. (default false)") serviceFlags.BoolVar(&config.DisableRelay, "disable-relay", config.DisableRelay, "Disable relay connections") - serviceFlags.BoolVar(&config.TunnelDNS, "tunnel-dns", config.TunnelDNS, "Use tunnel for DNS traffic") + serviceFlags.BoolVar(&config.TunnelDNS, "tunnel-dns", config.TunnelDNS, "When enabled, DNS queries are routed through the tunnel for remote resolution. To ensure queries are tunneled correctly, you must define the DNS server as a Pangolin resource and enter its address as an Upstream DNS Server. (default false)") // serviceFlags.BoolVar(&config.DoNotCreateNewClient, "do-not-create-new-client", config.DoNotCreateNewClient, "Do not create new client") version := serviceFlags.Bool("version", false, "Print the version") From 584298e3bd6c38e867aafc490560a2af3fbab7e1 Mon Sep 17 00:00:00 2001 From: Owen Date: Tue, 27 Jan 2026 20:19:25 -0800 Subject: [PATCH 2/2] Fix terminate due to inactivity --- olm/connect.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/olm/connect.go b/olm/connect.go index 575a8fd..94a219e 100644 --- a/olm/connect.go +++ b/olm/connect.go @@ -255,6 +255,12 @@ func (o *Olm) handleTerminate(msg websocket.WSMessage) { logger.Error("Error unmarshaling terminate error data: %v", err) } else { logger.Info("Terminate reason (code: %s): %s", errorData.Code, errorData.Message) + + if errorData.Code == "TERMINATED_INACTIVITY" { + logger.Info("Ignoring...") + return + } + // Set the olm error in the API server so it can be exposed via status o.apiServer.SetOlmError(errorData.Code, errorData.Message) }