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

wgengine/magicsock: set conn field in relayHandshakeDiscoMsgEvent (#16348)

Browse Source 
Updates tailscale/corp#27502

Signed-off-by: Jordan Whited <jordan@tailscale.com>
This commit is contained in:
Jordan Whited 2025-06-21 19:09:36 -07:00 committed by GitHub
parent e935a28a19
commit 61958f531c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgengine/magicsock/endpoint.go
View File

@ -1601,7 +1601,7 @@ func (de *endpoint) handlePongConnLocked(m *disco.Pong, di *discoInfo, src epAdd
if src.vni.isSet() && src != de.bestAddr.epAddr { if src.vni.isSet() && src != de.bestAddr.epAddr {
// "src" is not our bestAddr, but [relayManager] might be in the // "src" is not our bestAddr, but [relayManager] might be in the
// middle of probing it, awaiting pong reception. Make it aware. // middle of probing it, awaiting pong reception. Make it aware.
de.c.relayManager.handleGeneveEncapDiscoMsgNotBestAddr(m, di, src) de.c.relayManager.handleGeneveEncapDiscoMsgNotBestAddr(de.c, m, di, src)
return false return false
} }

6
wgengine/magicsock/magicsock.go
View File

@ -2053,7 +2053,7 @@ func (c *Conn) handleDiscoMessage(msg []byte, src epAddr, shouldBeRelayHandshake
c.logf("[unexpected] %T packets should not come from a relay server with Geneve control bit set", dm) c.logf("[unexpected] %T packets should not come from a relay server with Geneve control bit set", dm)
return return
} }
c.relayManager.handleGeneveEncapDiscoMsgNotBestAddr(challenge, di, src) c.relayManager.handleGeneveEncapDiscoMsgNotBestAddr(c, challenge, di, src)
return return
} }
@ -2075,7 +2075,7 @@ func (c *Conn) handleDiscoMessage(msg []byte, src epAddr, shouldBeRelayHandshake
return true return true
}) })
if !knownTxID && src.vni.isSet() { if !knownTxID && src.vni.isSet() {
c.relayManager.handleGeneveEncapDiscoMsgNotBestAddr(dm, di, src) c.relayManager.handleGeneveEncapDiscoMsgNotBestAddr(c, dm, di, src)
} }
case *disco.CallMeMaybe, *disco.CallMeMaybeVia: case *disco.CallMeMaybe, *disco.CallMeMaybeVia:
var via *disco.CallMeMaybeVia var via *disco.CallMeMaybeVia
@ -2221,7 +2221,7 @@ func (c *Conn) handlePingLocked(dm *disco.Ping, src epAddr, di *discoInfo, derpN
// using it as a bestAddr. [relayManager] might be in the middle of // using it as a bestAddr. [relayManager] might be in the middle of
// probing it or attempting to set it as best via // probing it or attempting to set it as best via
// [endpoint.relayEndpointReady()]. Make [relayManager] aware. // [endpoint.relayEndpointReady()]. Make [relayManager] aware.
c.relayManager.handleGeneveEncapDiscoMsgNotBestAddr(dm, di, src) c.relayManager.handleGeneveEncapDiscoMsgNotBestAddr(c, dm, di, src)
return return
} }
default: // no VNI default: // no VNI

4
wgengine/magicsock/relaymanager.go
View File

@ -319,8 +319,8 @@ func (r *relayManager) handleCallMeMaybeVia(ep *endpoint, dm *disco.CallMeMaybeV
// handleGeneveEncapDiscoMsgNotBestAddr handles reception of Geneve-encapsulated // handleGeneveEncapDiscoMsgNotBestAddr handles reception of Geneve-encapsulated
// disco messages if they are not associated with any known // disco messages if they are not associated with any known
// [*endpoint.bestAddr]. // [*endpoint.bestAddr].
func (r *relayManager) handleGeneveEncapDiscoMsgNotBestAddr(dm disco.Message, di *discoInfo, src epAddr) { func (r *relayManager) handleGeneveEncapDiscoMsgNotBestAddr(conn *Conn, dm disco.Message, di *discoInfo, src epAddr) {
relayManagerInputEvent(r, nil, &r.rxHandshakeDiscoMsgCh, relayHandshakeDiscoMsgEvent{msg: dm, disco: di.discoKey, from: src.ap, vni: src.vni.get(), at: time.Now()}) relayManagerInputEvent(r, nil, &r.rxHandshakeDiscoMsgCh, relayHandshakeDiscoMsgEvent{conn: conn, msg: dm, disco: di.discoKey, from: src.ap, vni: src.vni.get(), at: time.Now()})
} }
// handleRelayServersSet handles an update of the complete relay server set. // handleRelayServersSet handles an update of the complete relay server set.

2
wgengine/magicsock/relaymanager_test.go
View File

@ -26,7 +26,7 @@ func TestRelayManagerInitAndIdle(t *testing.T) {
<-rm.runLoopStoppedCh <-rm.runLoopStoppedCh
rm = relayManager{} rm = relayManager{}
rm.handleGeneveEncapDiscoMsgNotBestAddr(&disco.BindUDPRelayEndpointChallenge{}, &discoInfo{}, epAddr{}) rm.handleGeneveEncapDiscoMsgNotBestAddr(&Conn{discoPrivate: key.NewDisco()}, &disco.BindUDPRelayEndpointChallenge{}, &discoInfo{}, epAddr{})
<-rm.runLoopStoppedCh <-rm.runLoopStoppedCh
rm = relayManager{} rm = relayManager{}