From da65175300f8c419a791c97088afe71c371c0be3 Mon Sep 17 00:00:00 2001
From: Viktor Liu <viktor@netbird.io>
Date: Mon, 31 Aug 2026 13:25:54 +0200
Subject: [PATCH] Fall back to activity monitoring when an active re-add fails
 to open

---
 client/internal/conn_mgr.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/internal/conn_mgr.go b/client/internal/conn_mgr.go
index 1e9afd634..f54a7190d 100644
--- a/client/internal/conn_mgr.go
+++ b/client/internal/conn_mgr.go
@@ -233,7 +233,10 @@ func (e *ConnMgr) AddPeerConn(ctx context.Context, peerKey string, conn *peer.Co
 
 	if active {
 		conn.Log.Infof("peer added to lazy conn manager as active")
-		e.openConn(ctx, conn)
+		if err := conn.Open(ctx); err != nil {
+			conn.Log.Errorf("failed to open connection, falling back to activity monitoring: %v", err)
+			e.lazyConnMgr.DeactivatePeer(conn.ConnID())
+		}
 		return
 	}