Avoid constant rebinding on blocked endpoints

coder · Dec 12, 2023 · 2cdd5b8 · 2cdd5b8
1 parent 614a18f
commit 2cdd5b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
@@ -548,7 +548,7 @@ func (c *Conn) updateEndpoints(why string) {
 		c.muCond.Broadcast()
 	}()
 	c.dlogf("[v1] magicsock: starting endpoint update (%s)", why)
-	if c.noV4Send.Load() && c.derpMapHasSTUNNodes() && runtime.GOOS != "js" {
+	if c.noV4Send.Load() && c.shouldRebindOnFailedNetcheckV4Send() && runtime.GOOS != "js" {
 		c.mu.Lock()
 		closed := c.closed
 		c.mu.Unlock()
@@ -573,10 +573,10 @@ func (c *Conn) updateEndpoints(why string) {
 }
 
 // c.mu must NOT be held.
-func (c *Conn) derpMapHasSTUNNodes() bool {
+func (c *Conn) shouldRebindOnFailedNetcheckV4Send() bool {
 	c.mu.Lock()
 	defer c.mu.Unlock()
-	return c.derpMap != nil && c.derpMap.HasSTUN()
+	return c.derpMap != nil && c.derpMap.HasSTUN() && !c.blockEndpoints
 }
 
 // setEndpoints records the new endpoints, reporting whether they're changed.

diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go
@@ -3127,4 +3127,5 @@ func waitForNoEndpoints(t *testing.T, ms *Conn) {
 	if !ok {
 		t.Fatal("endpoints were not blocked after 50 attempts")
 	}
+	t.Log("endpoints are blocked")
 }