From 1632f9fd6bf5f31011355da724d2f0832b33f11f Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Fri, 12 Feb 2021 10:17:55 -0800 Subject: [PATCH] wgengine/magicsock: reduce log spam during tests Only do the type assertion to *net.UDPAddr when addr is non-nil. This prevents a bunch of log spam during tests. --- wgengine/magicsock/magicsock.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index 45651699f..407ca1720 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -2775,10 +2775,11 @@ func (c *RebindingUDPConn) ReadFromNetaddr(b []byte) (n int, ipp netaddr.IPPort, } else { var addr net.Addr n, addr, err = pconn.ReadFrom(b) - var ok2 bool - pAddr, ok2 = addr.(*net.UDPAddr) - if !ok2 { - return 0, netaddr.IPPort{}, fmt.Errorf("RebindingUDPConn.ReadFromNetaddr: underlying connection returned address of type %T, want *netaddr.UDPAddr", addr) + if addr != nil { + pAddr, ok = addr.(*net.UDPAddr) + if !ok { + return 0, netaddr.IPPort{}, fmt.Errorf("RebindingUDPConn.ReadFromNetaddr: underlying connection returned address of type %T, want *netaddr.UDPAddr", addr) + } } }