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

wgengine/magicsock: skip stun4localport if explicitconf endpoints available

Browse Source 
When a local port is set, we guess that users may have configured a
static port mapping on their router and add an endpoint that combines
their STUN-discovered IP address with their local port. It's
generally fine if this is invalid, as it simply won't work. However,
when there is explicit static endpoints configuration, there's no
point adding this guessed endpoint, because the user has told us
exactly what port mapping they set up for the client. This reduces
noise/confusion when debugging endpoints for multiple containerized
clients running on the same host, and should also make discovery
very marginally more efficient.

Note, this does not interact with TS_DEBUG_PRETENDPOINTS as that is
a temporary debug setting, and static endpoints configuration is the
only stable way to interact with explicitconf endpoints for now.

Updates #14674, #12578

Change-Id: I4b0788a12e413df0972cde5f102304f88a933df3
Signed-off-by: Tom Proctor <tomhjp@users.noreply.github.com>
This commit is contained in:
Tom Proctor 2025-06-10 10:07:31 +01:00
parent db34cdcfe7
commit 8819cf3ff1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wgengine/magicsock/magicsock.go
View File

@ -1128,7 +1128,10 @@ func (c *Conn) determineEndpoints(ctx context.Context) ([]tailcfg.Endpoint, erro
// port mapping on their router to the same explicit // port mapping on their router to the same explicit
// port that tailscaled is running with. Worst case // port that tailscaled is running with. Worst case
// it's an invalid candidate mapping. // it's an invalid candidate mapping.
if port := c.port.Load(); nr.MappingVariesByDestIP.EqualBool(true) && port != 0 { //
// However, no need to guess if we have explicit static
// endpoints configured.
if port := c.port.Load(); nr.MappingVariesByDestIP.EqualBool(true) && port != 0 && c.staticEndpoints.Len() == 0 {
addAddr(netip.AddrPortFrom(v4Addrs[0].Addr(), uint16(port)), tailcfg.EndpointSTUN4LocalPort) addAddr(netip.AddrPortFrom(v4Addrs[0].Addr(), uint16(port)), tailcfg.EndpointSTUN4LocalPort)
} }
} }