TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Claire Wang 2024-01-25 16:29:27 -05:00
parent 0f3b2e7b86
commit 1ae16546af
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
control/controlknobs/controlknobs.go
View File

@ -73,6 +73,9 @@ type Knobs struct {
// ProbeUDPLifetime is whether the node should probe UDP path lifetime on
// the tail end of an active direct connection in magicsock.
ProbeUDPLifetime atomic.Bool
// SuggestedExitNode is whether the node should be given a suggested exit node.
SuggestedExitNode atomic.Bool
}
// UpdateFromNodeAttributes updates k (if non-nil) based on the provided self
@ -100,6 +103,7 @@ func (k *Knobs) UpdateFromNodeAttributes(selfNodeAttrs []tailcfg.NodeCapability,
forceNfTables = has(tailcfg.NodeAttrLinuxMustUseNfTables)
seamlessKeyRenewal = has(tailcfg.NodeAttrSeamlessKeyRenewal)
probeUDPLifetime = has(tailcfg.NodeAttrProbeUDPLifetime)
suggestedExitNode = has(tailcfg.NodeAttrSuggestedExitNode)
)
if has(tailcfg.NodeAttrOneCGNATEnable) {
@ -122,6 +126,7 @@ func (k *Knobs) UpdateFromNodeAttributes(selfNodeAttrs []tailcfg.NodeCapability,
k.LinuxForceNfTables.Store(forceNfTables)
k.SeamlessKeyRenewal.Store(seamlessKeyRenewal)
k.ProbeUDPLifetime.Store(probeUDPLifetime)
k.SuggestedExitNode.Store(suggestedExitNode)
}
// AsDebugJSON returns k as something that can be marshalled with json.Marshal
@ -145,5 +150,6 @@ func (k *Knobs) AsDebugJSON() map[string]any {
"LinuxForceNfTables": k.LinuxForceNfTables.Load(),
"SeamlessKeyRenewal": k.SeamlessKeyRenewal.Load(),
"ProbeUDPLifetime": k.ProbeUDPLifetime.Load(),
"SuggestedExitNode": k.SuggestedExitNode.Load(),
}
}

7
tailcfg/tailcfg.go
View File

@ -1740,6 +1740,10 @@ type MapResponse struct {
// Starting with MapRequest.Version 18, nil means unchanged.
Node *Node `json:",omitempty"`
// SuggestedExitNode describes the suggested exit node to use
// given the self node's derp region.
SuggestedExitNode *Node `json:",omitempty"`
// DERPMap describe the set of DERP servers available.
// A nil value means unchanged.
DERPMap *DERPMap `json:",omitempty"`
@ -2208,6 +2212,9 @@ type Oauth2Token struct {
// NodeAttrProbeUDPLifetime makes the client probe UDP path lifetime at the
// tail end of an active direct connection in magicsock.
NodeAttrProbeUDPLifetime NodeCapability = "probe-udp-lifetime"
// NodeAttrSuggestedExitNode makes clients determine a suggested exit node.
NodeAttrSuggestedExitNode NodeCapability = "suggested-exit-node"
)
// SetDNSRequest is a request to add a DNS record.