CodeCow/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-07-20 21:23:07 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

wgengine/magicsock,tstest/natlab/vmtest: only send callMeMaybe with endpoints (#20088) (#20089)

Browse Source 
9be21088f4 changed sending disco pings so
a callMeMaybe would be not be gated by endpoints existing if the node
was running off of a cached netmap.

This commit partly reverts that change, but keeps in a few bug fixes in
that commit and the tests that was introduced and now skipped.

The behaviour prior to 9be21088f4 is
retained.

Updates #20085


(cherry picked from commit 2690d58e47)

Signed-off-by: Claus Lensbøl <[email protected]>
This commit is contained in:
Claus Lensbøl
2026-06-10 17:40:20 -04:00
committed by GitHub
parent fdc5409b23
commit b994aba45a
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tstest/natlab/vmtest/vmtest_test.go
+14
View File
@@ -14,6 +14,7 @@ import (
"time"
"tailscale.com/client/local"
"tailscale.com/cmd/testwrapper/flakytest"
"tailscale.com/ipn"
"tailscale.com/net/udprelay/status"
"tailscale.com/tailcfg"
@@ -1064,9 +1065,17 @@ func TestCachedNetmapAfterRestart(t *testing.T) {
//
// The test has two modes, pinging from the offline node to the online node,
// and pinging from the online node to the offline node.
//
// TODO(cmol): The online -> offline test is flakey for now. The TSMP disco
// key exchange currently relies on disco ping messages being sent. These will
// however not be sent if there is not endpoints on the online node which is
// possible in the event where a node has registered but not finished STUN.
func TestDirectConnectionWithCachedNetmapOnOneNode(t *testing.T) {
for _, testPingFrom := range []string{"offline", "online"} {
t.Run(fmt.Sprintf("ping_from_%s", testPingFrom), func(t *testing.T) {
if testPingFrom == "online" {
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/19843")
}
env := vmtest.New(t)
aNet := env.AddNetwork("1.0.0.1", "192.168.1.1/24", vnet.EasyNAT)
@@ -1151,7 +1160,12 @@ func TestDirectConnectionWithCachedNetmapOnOneNode(t *testing.T) {
// WireGuard tunnel after both restarted while the control server is
// unreachable. After restart one node must use only its on-disk cached
// netmaps to re-connect and ping the other node.
// TODO(cmol): The test is flakey for now. The TSMP disco key exchange
// currently relies on disco ping messages being sent. These will however not
// be sent if there is not endpoints on the online node which is possible in
// the event where a node has registered but not finished STUN.
func TestDirectConnectionWithCachedNetmapOnTwoNodes(t *testing.T) {
flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/19843")
env := vmtest.New(t)
aNet := env.AddNetwork("1.0.0.1", "192.168.1.1/24", vnet.EasyNAT)
wgengine/magicsock/endpoint.go
+1 -8
View File
@@ -1388,19 +1388,12 @@ func (de *endpoint) sendDiscoPingsLocked(now mono.Time, sendCallMeMaybe bool) {
de.startDiscoPingLocked(epAddr{ap: ep}, now, pingDiscovery, 0, nil)
}
derpAddr := de.derpAddr
if sendCallMeMaybe && derpAddr.IsValid() && (sentAny || de.c.usingCachedNetmap.Load()) {
if sentAny && sendCallMeMaybe && derpAddr.IsValid() {
// Have our magicsock.Conn figure out its STUN endpoint (if
// it doesn't know already) and then send a CallMeMaybe
// message to our peer via DERP informing them that we've
// sent so our firewall ports are probably open and now
// would be a good time for them to connect.
//
// When working off of a cached netmap, send out a CallMeMaybe
// even if we don't know about any peer endpoints.
// Since we cannot rely on control to transfer endpoints for us,
// this makes establishing direct connections more reliable
// as the peer will respond with its own message and initiate
// the connection.
go de.c.enqueueCallMeMaybe(derpAddr, de)
}
}