mirror/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-05-11 08:35:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: always ReSTUN when starting up without a cache (#19586)

Browse Source 
78627c1 introduced starting up and preserving the DERP server from
cache, but also changed it so the initial ReSTUN would not fire when
setting the DERPMap.

Change this so when not working from a cache, the ReSTUN will always
fire during startup.

Updates #19585

Signed-off-by: Claus Lensbøl <claus@tailscale.com>
This commit is contained in:
Claus Lensbøl
2026-04-29 18:56:57 -04:00
committed by GitHub
parent c0a9728fe2
commit 978b6a81b2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ipn/ipnlocal/local.go
View File

@@ -1867,18 +1867,24 @@ func (b *LocalBackend) setControlClientStatusLocked(c controlclient.Client, st c
}
b.e.SetNetworkMap(st.NetMap)
b.MagicConn().SetDERPMapWithoutReSTUN(st.NetMap.DERPMap)
var cachedHome int
if c == nil && st.NetMap.Cached && st.NetMap.SelfNode.Valid() {
cachedHome = st.NetMap.SelfNode.HomeDERP()
}
if cachedHome != 0 {
// Loading from a cached netmap (c == nil means no live control
// client). Pre-seed the home DERP from the cached self node so
// that the guard in maybeSetNearestDERP prevents changing the
// DERP home before we reconnect to the control plane. If the cache has
// nothing in it, skip this, and let the node pick a DERP itself.
if cachedHome := st.NetMap.SelfNode.HomeDERP(); cachedHome != 0 {
b.health.SetOutOfPollNetMap()
b.MagicConn().ForceSetNearestDERP(cachedHome)
}
b.MagicConn().SetDERPMapWithoutReSTUN(st.NetMap.DERPMap)
b.health.SetOutOfPollNetMap()
b.MagicConn().ForceSetNearestDERP(cachedHome)
} else {
b.MagicConn().SetDERPMap(st.NetMap.DERPMap)
}
b.MagicConn().SetOnlyTCP443(st.NetMap.HasCap(tailcfg.NodeAttrOnlyTCP443))
// Update our cached DERP map