From bfeb60fbb5b2928628ba8b62b06b49dda427956b Mon Sep 17 00:00:00 2001 From: mlsmaycon Date: Sun, 1 Feb 2026 10:23:25 +0100 Subject: [PATCH] Create a system proxy change after receiving a network map This is experimental and needs more test. the purpose of this change is to validate that a TLS connection stuck using old routes because of keepalive settings on the remote webserver are reset once netbird receives a network map --- client/internal/engine.go | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/client/internal/engine.go b/client/internal/engine.go index a471b2d1c..59d084351 100644 --- a/client/internal/engine.go +++ b/client/internal/engine.go @@ -49,7 +49,6 @@ import ( "github.com/netbirdio/netbird/client/internal/rosenpass" "github.com/netbirdio/netbird/client/internal/routemanager" "github.com/netbirdio/netbird/client/internal/routemanager/systemops" - "github.com/netbirdio/netbird/client/internal/routemanager/vars" "github.com/netbirdio/netbird/client/internal/statemanager" "github.com/netbirdio/netbird/client/internal/updatemanager" "github.com/netbirdio/netbird/client/jobexec" @@ -2326,18 +2325,6 @@ func createFile(path string) error { return file.Close() } -// containsExitNodeRoute checks if the routes contain an exit node (0.0.0.0/0). -func containsExitNodeRoute(clientRoutes route.HAMap) bool { - for _, routes := range clientRoutes { - for _, r := range routes { - if r.Network.String() == vars.ExitNodeCIDR { - return true - } - } - } - return false -} - // updateSystemProxy triggers a proxy enable/disable cycle after the network map is updated. func (e *Engine) updateSystemProxy(clientRoutes route.HAMap) { if runtime.GOOS != "darwin" || e.proxyManager == nil { @@ -2346,13 +2333,13 @@ func (e *Engine) updateSystemProxy(clientRoutes route.HAMap) { } if err := e.proxyManager.EnableWebProxy(e.config.ProxyHost, e.config.ProxyPort); err != nil { - log.Error("enable system proxy: %v", err) + log.Errorf("enable system proxy: %v", err) return } log.Error("system proxy enabled after network map update") if err := e.proxyManager.DisableWebProxy(); err != nil { - log.Error("disable system proxy: %v", err) + log.Errorf("disable system proxy: %v", err) return } log.Error("system proxy disabled after network map update")