From bfb344905f5d12648031b0aaec27393ae4173e12 Mon Sep 17 00:00:00 2001
From: Simon Law <sfllaw@tailscale.com>
Date: Mon, 14 Jul 2025 18:51:55 -0700
Subject: [PATCH] ipn/ipnlocal: modernize nm.Peers with AppendMatchingPeers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to @nickkhyl for pointing out that NetMap.Peers doesn’t get
incremental updates since the last full NetMap update. Instead, he
recommends using ipn/ipnlocal.nodeBackend.AppendMatchingPeers.

Updates #cleanup

Signed-off-by: Simon Law <sfllaw@tailscale.com>
---
 ipn/ipnlocal/local.go | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go
index 4ed012f2e..cd1654eb1 100644
--- a/ipn/ipnlocal/local.go
+++ b/ipn/ipnlocal/local.go
@@ -7902,33 +7902,32 @@ func suggestExitNodeUsingTrafficSteering(nb *nodeBackend, prev tailcfg.StableNod
 		panic("missing traffic-steering capability")
 	}
 
-	peers := nm.Peers
-	nodes := make([]tailcfg.NodeView, 0, len(peers))
-
-	for _, p := range peers {
+	var force tailcfg.NodeView
+	nodes := nb.AppendMatchingPeers(nil, func(p tailcfg.NodeView) bool {
 		if !p.Valid() {
-			continue
+			return false
 		}
 		if allowed != nil && !allowed.Contains(p.StableID()) {
-			continue
+			return false
 		}
 		if !p.CapMap().Contains(tailcfg.NodeAttrSuggestExitNode) {
-			continue
+			return false
 		}
 		if !tsaddr.ContainsExitRoutes(p.AllowedIPs()) {
-			continue
+			return false
 		}
 		if p.StableID() == prev {
 			// Prevent flapping: since prev is a valid suggestion,
 			// force prev to be the only valid pick.
-			nodes = []tailcfg.NodeView{p}
-			break
+			force = p
+			return false
 		}
-		nodes = append(nodes, p)
+		return true
+	})
+	if force.Valid() {
+		nodes = append(nodes[:0], force)
 	}
 
-	var pick tailcfg.NodeView
-
 	scores := make(map[tailcfg.NodeID]int, len(nodes))
 	score := func(n tailcfg.NodeView) int {
 		id := n.ID()
@@ -7945,7 +7944,11 @@ func suggestExitNodeUsingTrafficSteering(nb *nodeBackend, prev tailcfg.StableNod
 		return s
 	}
 
-	if len(nodes) > 0 {
+	var pick tailcfg.NodeView
+	if len(nodes) == 1 {
+		pick = nodes[0]
+	}
+	if len(nodes) > 1 {
 		// Find the highest scoring exit nodes.
 		slices.SortFunc(nodes, func(a, b tailcfg.NodeView) int {
 			return cmp.Compare(score(b), score(a)) // reverse sort