TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-07-16 10:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

tailcfg, feature/relayserver, wgengine/magicsock: invert UDP relay server nodeAttrs (#16444)

Browse Source 
Inverts the nodeAttrs related to UDP relay client/server enablement to disablement, and fixes up the corresponding logic that uses them. Also updates the doc comments on both nodeAttrs.

Fixes tailscale/corp#30024

Signed-off-by: Dylan Bargatze <dylan@tailscale.com>
This commit is contained in:
Dylan Bargatze 2025-07-04 12:48:38 -04:00 committed by GitHub
parent 639fed6856
commit 92a114c66d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
feature/relayserver/relayserver.go
View File

@ -50,11 +50,11 @@ func newExtension(logf logger.Logf, _ ipnext.SafeBackend) (ipnext.Extension, err
type extension struct { type extension struct {
logf logger.Logf logf logger.Logf
mu sync.Mutex // guards the following fields mu sync.Mutex // guards the following fields
shutdown bool shutdown bool
port *int // ipn.Prefs.RelayServerPort, nil if disabled port *int // ipn.Prefs.RelayServerPort, nil if disabled
hasNodeAttrRelayServer bool // tailcfg.NodeAttrRelayServer hasNodeAttrDisableRelayServer bool // tailcfg.NodeAttrDisableRelayServer
server relayServer // lazily initialized server relayServer // lazily initialized
} }
// relayServer is the interface of [udprelay.Server]. // relayServer is the interface of [udprelay.Server].
@ -81,8 +81,8 @@ func (e *extension) Init(host ipnext.Host) error {
func (e *extension) selfNodeViewChanged(nodeView tailcfg.NodeView) { func (e *extension) selfNodeViewChanged(nodeView tailcfg.NodeView) {
e.mu.Lock() e.mu.Lock()
defer e.mu.Unlock() defer e.mu.Unlock()
e.hasNodeAttrRelayServer = nodeView.HasCap(tailcfg.NodeAttrRelayServer) e.hasNodeAttrDisableRelayServer = nodeView.HasCap(tailcfg.NodeAttrDisableRelayServer)
if !e.hasNodeAttrRelayServer && e.server != nil { if e.hasNodeAttrDisableRelayServer && e.server != nil {
e.server.Close() e.server.Close()
e.server = nil e.server = nil
} }
@ -130,8 +130,8 @@ func (e *extension) relayServerOrInit() (relayServer, error) {
if e.port == nil { if e.port == nil {
return nil, errors.New("relay server is not configured") return nil, errors.New("relay server is not configured")
} }
if !e.hasNodeAttrRelayServer { if e.hasNodeAttrDisableRelayServer {
return nil, errors.New("no relay:server node attribute") return nil, errors.New("disable-relay-server node attribute is present")
} }
if !envknob.UseWIPCode() { if !envknob.UseWIPCode() {
return nil, errors.New("TAILSCALE_USE_WIP_CODE envvar is not set") return nil, errors.New("TAILSCALE_USE_WIP_CODE envvar is not set")

19
tailcfg/tailcfg.go
View File

@ -2602,13 +2602,20 @@ const (
// peer node list. // peer node list.
NodeAttrNativeIPV4 NodeCapability = "native-ipv4" NodeAttrNativeIPV4 NodeCapability = "native-ipv4"
// NodeAttrRelayServer permits the node to act as an underlay UDP relay // NodeAttrDisableRelayServer prevents the node from acting as an underlay
// server. There are no expected values for this key in NodeCapMap. // UDP relay server. There are no expected values for this key; the key
NodeAttrRelayServer NodeCapability = "relay:server" // only needs to be present in [NodeCapMap] to take effect.
NodeAttrDisableRelayServer NodeCapability = "disable-relay-server"
// NodeAttrRelayClient permits the node to act as an underlay UDP relay // NodeAttrDisableRelayClient prevents the node from allocating UDP relay
// client. There are no expected values for this key in NodeCapMap. // server endpoints itself; the node may still bind into and relay traffic
NodeAttrRelayClient NodeCapability = "relay:client" // using endpoints allocated by its peers. This attribute can be added to
// the node dynamically; if added while the node is already running, the
// node will be unable to allocate UDP relay server endpoints after it next
// updates its network map. There are no expected values for this key in
// [NodeCapMap]; the key only needs to be present in [NodeCapMap] to take
// effect.
NodeAttrDisableRelayClient NodeCapability = "disable-relay-client"
// NodeAttrMagicDNSPeerAAAA is a capability that tells the node's MagicDNS // NodeAttrMagicDNSPeerAAAA is a capability that tells the node's MagicDNS
// server to answer AAAA queries about its peers. See tailscale/tailscale#1152. // server to answer AAAA queries about its peers. See tailscale/tailscale#1152.

2
wgengine/magicsock/magicsock.go
View File

@ -2703,7 +2703,7 @@ func (c *Conn) onNodeViewsUpdate(update NodeViewsUpdate) {
peersChanged := c.updateNodes(update) peersChanged := c.updateNodes(update)
relayClientEnabled := update.SelfNode.Valid() && relayClientEnabled := update.SelfNode.Valid() &&
update.SelfNode.HasCap(tailcfg.NodeAttrRelayClient) && !update.SelfNode.HasCap(tailcfg.NodeAttrDisableRelayClient) &&
envknob.UseWIPCode() envknob.UseWIPCode()
c.mu.Lock() c.mu.Lock()

3
wgengine/magicsock/magicsock_test.go
View File

@ -3408,9 +3408,6 @@ func Test_peerAPIIfCandidateRelayServer(t *testing.T) {
} }
peerOnlyIPv4 := &tailcfg.Node{ peerOnlyIPv4 := &tailcfg.Node{
Cap: math.MinInt32, Cap: math.MinInt32,
CapMap: map[tailcfg.NodeCapability][]tailcfg.RawMessage{
tailcfg.NodeAttrRelayServer: nil,
},
Addresses: []netip.Prefix{ Addresses: []netip.Prefix{
netip.MustParsePrefix("2.2.2.2/32"), netip.MustParsePrefix("2.2.2.2/32"),
}, },