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

feature/relayserver,wgengine/magicsock: remove WIP gating of peer relay (#16533)

Browse Source 
Updates tailscale/corp#30051

Signed-off-by: Jordan Whited <jordan@tailscale.com>
This commit is contained in:
Jordan Whited 2025-07-10 18:52:01 -07:00 committed by GitHub
parent 5f678b9bec
commit bd29a1c8c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
feature/relayserver/relayserver.go
View File

@ -14,7 +14,6 @@ import (
"sync" "sync"
"time" "time"
"tailscale.com/envknob"
"tailscale.com/feature" "tailscale.com/feature"
"tailscale.com/ipn" "tailscale.com/ipn"
"tailscale.com/ipn/ipnext" "tailscale.com/ipn/ipnext"
@ -133,9 +132,6 @@ func (e *extension) relayServerOrInit() (relayServer, error) {
if e.hasNodeAttrDisableRelayServer { if e.hasNodeAttrDisableRelayServer {
return nil, errors.New("disable-relay-server node attribute is present") return nil, errors.New("disable-relay-server node attribute is present")
} }
if !envknob.UseWIPCode() {
return nil, errors.New("TAILSCALE_USE_WIP_CODE envvar is not set")
}
var err error var err error
e.server, err = udprelay.NewServer(e.logf, *e.port, nil) e.server, err = udprelay.NewServer(e.logf, *e.port, nil)
if err != nil { if err != nil {

3
wgengine/magicsock/magicsock.go
View File

@ -2724,8 +2724,7 @@ func (c *Conn) onNodeViewsUpdate(update NodeViewsUpdate) {
relayClientEnabled := update.SelfNode.Valid() && relayClientEnabled := update.SelfNode.Valid() &&
!update.SelfNode.HasCap(tailcfg.NodeAttrDisableRelayClient) && !update.SelfNode.HasCap(tailcfg.NodeAttrDisableRelayClient) &&
!update.SelfNode.HasCap(tailcfg.NodeAttrOnlyTCP443) && !update.SelfNode.HasCap(tailcfg.NodeAttrOnlyTCP443)
envknob.UseWIPCode()
c.mu.Lock() c.mu.Lock()
relayClientChanged := c.relayClientEnabled != relayClientEnabled relayClientChanged := c.relayClientEnabled != relayClientEnabled