diff --git a/Makefile b/Makefile index bc44e74..520f1b4 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ GO = go CGO_ENABLED = 1 WINDRES ?= x86_64-w64-mingw32-windres MINGW_CC ?= x86_64-w64-mingw32-gcc -SEMVER ?= 0.6.8 +SEMVER ?= 0.6.9 GIT_HASH = $(shell git rev-parse --short HEAD 2>/dev/null || echo unknown) VERSION = $(SEMVER)-$(GIT_HASH) LDFLAGS = -s -w -X lmvpn/internal/version.Version=$(VERSION) diff --git a/internal/vpn/session.go b/internal/vpn/session.go index abddfa6..f7cb363 100644 --- a/internal/vpn/session.go +++ b/internal/vpn/session.go @@ -197,7 +197,7 @@ func (sm *SessionManager) run(ctx context.Context, cfg SessionConfig) { // to avoid consuming the server's 30s ReadyTimeout budget. var beforeCIDRs []string allURLSources := append(append([]model.CIDRURLSource{}, cfg.CIDRV4URLs...), cfg.CIDRV6URLs...) - if len(allURLSources) > 0 { + if len(allURLSources) > 0 && cfg.RoutingMode != route.ModeFull { sm.stats.SetConnectStep("fetch_cidrs") sm.setState(stats.StateConnecting) log.L().Info("fetching before-proxy CIDR lists", "url_count", len(allURLSources)) @@ -588,6 +588,9 @@ func (sm *SessionManager) setupTUN(init protocol.InitMessage, cfg SessionConfig, // (via the tunnel) and dynamically adds their routes to the route // manager. This is called in a goroutine after the data plane is up. func (sm *SessionManager) fetchAfterProxyCIDRs(ctx context.Context, cfg SessionConfig) { + if cfg.RoutingMode == route.ModeFull { + return + } allURLSources := append(append([]model.CIDRURLSource{}, cfg.CIDRV4URLs...), cfg.CIDRV6URLs...) // Count only "after" sources for logging. afterCount := 0 @@ -659,6 +662,10 @@ func (sm *SessionManager) RefreshCIDRs() { return } + if cfg.RoutingMode == route.ModeFull { + return + } + // Use a background context with 30s timeout so the refresh works // even if the session context is in a weird state. refreshCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)