From 98714e784b7190d49ccdd323134071a5261c6c1f Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Mon, 19 Apr 2021 15:47:30 -0700 Subject: [PATCH] wgengine/magicsock: improve Rebind logging We were accidentally logging oldPort -> oldPort. Log oldPort as well as c.port; if we failed to get the preferred port in a previous rebind, oldPort might differ from c.port. Signed-off-by: Josh Bleecher Snyder --- wgengine/magicsock/magicsock.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index fae407db8..c8cb99c4c 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -2658,10 +2658,10 @@ func (c *Conn) Rebind() { c.pconn4.mu.Unlock() return } - newPort := c.pconn4.localAddrLocked().Port + newPort := packetConn.LocalAddr().(*net.UDPAddr).Port c.logf("magicsock: link change rebound port: from %v to %v (failed to get %v)", oldPort, newPort, c.port) } else { - c.logf("magicsock: link change rebound port: %d", c.port) + c.logf("magicsock: link change rebound port from %d to %d", oldPort, c.port) } c.pconn4.pconn = packetConn.(*net.UDPConn) c.pconn4.mu.Unlock()