From f9039f0ba6a1ea19d0ae47810b19cef2321e221d Mon Sep 17 00:00:00 2001
From: Viktor Liu <viktor@netbird.io>
Date: Tue, 14 Jul 2026 13:31:25 +0200
Subject: [PATCH] Run lazy connection manager for rosenpass peers

---
 client/internal/conn_mgr.go | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/client/internal/conn_mgr.go b/client/internal/conn_mgr.go
index 8849ad5fd..472788b25 100644
--- a/client/internal/conn_mgr.go
+++ b/client/internal/conn_mgr.go
@@ -37,11 +37,10 @@ const (
 //
 // The implementation is not thread-safe; it is protected by engine.syncMsgMux.
 type ConnMgr struct {
-	peerStore        *peerstore.Store
-	statusRecorder   *peer.Status
-	iface            lazyconn.WGIface
-	force            lazyForce
-	rosenpassEnabled bool
+	peerStore      *peerstore.Store
+	statusRecorder *peer.Status
+	iface          lazyconn.WGIface
+	force          lazyForce
 	// remoteLazyEnabled caches the account-wide lazy feature flag from management.
 	// It is the default for peers that do not carry a per-peer lazy hint.
 	remoteLazyEnabled bool
@@ -58,11 +57,10 @@ type ConnMgr struct {
 
 func NewConnMgr(engineConfig *EngineConfig, statusRecorder *peer.Status, peerStore *peerstore.Store, iface lazyconn.WGIface) *ConnMgr {
 	e := &ConnMgr{
-		peerStore:        peerStore,
-		statusRecorder:   statusRecorder,
-		iface:            iface,
-		force:            resolveLazyForce(engineConfig.LazyConnection),
-		rosenpassEnabled: engineConfig.RosenpassEnabled,
+		peerStore:      peerStore,
+		statusRecorder: statusRecorder,
+		iface:          iface,
+		force:          resolveLazyForce(engineConfig.LazyConnection),
 	}
 	return e
 }
@@ -70,19 +68,14 @@ func NewConnMgr(engineConfig *EngineConfig, statusRecorder *peer.Status, peerSto
 // Start initializes the connection manager. The lazy connection manager always runs so that
 // per-peer lazy defaults (e.g. proxy peers) work even when the account flag is off; the
 // account flag and the local override decide the default lazy state per peer (see
-// PeerLazyDefault). Rosenpass is the only condition that disables it.
+// PeerLazyDefault). Rosenpass peers stay lazy-capable too: their connections just never idle
+// on their own, since rosenpass rekey traffic keeps them active.
 func (e *ConnMgr) Start(ctx context.Context) {
 	if e.lazyConnMgr != nil {
 		log.Errorf("lazy connection manager is already started")
 		return
 	}
 
-	if e.rosenpassEnabled {
-		log.Warnf("rosenpass is enabled, lazy connection manager will not be started")
-		e.statusRecorder.UpdateLazyConnection(false)
-		return
-	}
-
 	e.initLazyManager(ctx)
 	e.statusRecorder.UpdateLazyConnection(e.PeerLazyDefault(mgmProto.LazyState_LazyStateDefault))
 }