mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-01 18:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: simplify pickNewAutoExitNode

Browse Source 
(*profileManager).CurrentPrefs() is always valid. Additionally, there's no value in cloning
and passing the full ipn.Prefs when editing preferences. Instead, ipn.MaskedPrefs should
only have ExitNodeID set.

Updates tailscale/corp#29969

Signed-off-by: Nick Khyl <nickk@tailscale.com>
This commit is contained in:
Nick Khyl 2025-07-02 19:16:39 -05:00 committed by Nick Khyl
parent 1a2185b1ee
commit 56d772bd63
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipn/ipnlocal/local.go
View File

@ -5835,23 +5835,16 @@ func (b *LocalBackend) pickNewAutoExitNode() {
unlock := b.lockAndGetUnlock() unlock := b.lockAndGetUnlock()
defer unlock() defer unlock()
prefs := b.pm.CurrentPrefs()
if !prefs.Valid() {
b.logf("[unexpected]: received tailnet exit node ID pref change callback but current prefs are nil")
return
}
prefsClone := prefs.AsStruct()
newSuggestion, err := b.suggestExitNodeLocked(nil) newSuggestion, err := b.suggestExitNodeLocked(nil)
if err != nil { if err != nil {
b.logf("setAutoExitNodeID: %v", err) b.logf("setAutoExitNodeID: %v", err)
return return
} }
if prefsClone.ExitNodeID == newSuggestion.ID { if b.pm.CurrentPrefs().ExitNodeID() == newSuggestion.ID {
return return
} }
prefsClone.ExitNodeID = newSuggestion.ID
_, err = b.editPrefsLockedOnEntry(&ipn.MaskedPrefs{ _, err = b.editPrefsLockedOnEntry(&ipn.MaskedPrefs{
Prefs: *prefsClone, Prefs: ipn.Prefs{ExitNodeID: newSuggestion.ID},
ExitNodeIDSet: true, ExitNodeIDSet: true,
}, unlock) }, unlock)
if err != nil { if err != nil {