wgengine/magicsock: fix watchdog timeout on Close when IPv6 not available

bradfitz · bradfitz · commit addda5b96fc5 · 2022-01-06T13:24:59.000-08:00
The blockForeverConn was only using its sync.Cond one side. Looks like it was just forgotten. Fixes tailscale#3671 Change-Id: I4ed0191982cdd0bfd451f133139428a4fa48238c Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
@@ -3121,6 +3121,7 @@ func (c *blockForeverConn) Close() error {
 		return net.ErrClosed
 	}
 	c.closed = true
+	c.cond.Broadcast()
 	return nil
 }
 
diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go
@@ -1763,3 +1763,27 @@ func (m *peerMap) validate() error {
 
 	return nil
 }
+
+func TestBlockForeverConnUnblocks(t *testing.T) {
+	c := newBlockForeverConn()
+	done := make(chan error, 1)
+	go func() {
+		defer close(done)
+		_, _, err := c.ReadFrom(make([]byte, 1))
+		done <- err
+	}()
+	time.Sleep(50 * time.Millisecond) // give ReadFrom time to get blocked
+	if err := c.Close(); err != nil {
+		t.Fatal(err)
+	}
+	timer := time.NewTimer(5 * time.Second)
+	defer timer.Stop()
+	select {
+	case err := <-done:
+		if err != net.ErrClosed {
+			t.Errorf("got %v; want net.ErrClosed", err)
+		}
+	case <-timer.C:
+		t.Fatal("timeout")
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -3121,6 +3121,7 @@ func (c *blockForeverConn) Close() error {`
`3121`	`3121`	`return net.ErrClosed`
`3122`	`3122`	`}`
`3123`	`3123`	`c.closed = true`
	`3124`	`+ c.cond.Broadcast()`
`3124`	`3125`	`return nil`
`3125`	`3126`	`}`
`3126`	`3127`