mirror/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-07-25 23:06:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

control/controlknobs,wgengine/magicsock: disable TSMP disco advert if netmap caching is disabled

Browse Source 
Updates #20081

Signed-off-by: Jordan Whited <jordan@tailscale.com>
(cherry picked from commit be2f554dd3)
This commit is contained in:
Jordan Whited
2026-06-17 18:01:25 -07:00
committed by Jordan Whited
parent a98b177b31
commit e43b5b6a35
3 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
control/controlknobs/controlknobs.go
View File

@@ -110,6 +110,11 @@ type Knobs struct {
// See https://github.com/tailscale/tailscale/issues/15404.
// TODO(bradfitz): remove this a few releases after 2026-02-16.
ForceRegisterMagicDNSIPv4Only atomic.Bool
// CacheNetworkMaps is whether the node should persistently cache network
// maps and use them to establish peer connectivity on start, if doing so
// is supported by the client and storage is available.
CacheNetworkMaps atomic.Bool
}
// UpdateFromNodeAttributes updates k (if non-nil) based on the provided self
@@ -139,6 +144,7 @@ func (k *Knobs) UpdateFromNodeAttributes(capMap tailcfg.NodeCapMap) {
disableSkipStatusQueue = has(tailcfg.NodeAttrDisableSkipStatusQueue)
disableHostsFileUpdates = has(tailcfg.NodeAttrDisableHostsFileUpdates)
forceRegisterMagicDNSIPv4Only = has(tailcfg.NodeAttrForceRegisterMagicDNSIPv4Only)
cacheNetworkMaps = has(tailcfg.NodeAttrCacheNetworkMaps)
)
if has(tailcfg.NodeAttrOneCGNATEnable) {
@@ -166,6 +172,7 @@ func (k *Knobs) UpdateFromNodeAttributes(capMap tailcfg.NodeCapMap) {
k.DisableSkipStatusQueue.Store(disableSkipStatusQueue)
k.DisableHostsFileUpdates.Store(disableHostsFileUpdates)
k.ForceRegisterMagicDNSIPv4Only.Store(forceRegisterMagicDNSIPv4Only)
k.CacheNetworkMaps.Store(cacheNetworkMaps)
}
// AsDebugJSON returns k as something that can be marshalled with json.Marshal