From b668e5d1858a7a1c29a98c8aefd069baef8be207 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Tue, 6 Jul 2021 12:26:14 -0700 Subject: [PATCH] tewak --- wgengine/magicsock/magicsock.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index 3208d3175..6a688e8c7 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -2855,17 +2855,17 @@ func (c *RebindingUDPConn) ReadFromNetaddr(b []byte) (n int, ipp netaddr.IPPort, for { pconn := c.currentConn() - // Optimization: Treat a few conn types specially. - // *uring.UDPConn can return netaddr.IPPorts directly. + // Optimization: Treat a few pconn types specially. // For *net.UDPConn, ReadFromUDP gets partially inlined, avoiding allocating a *net.UDPAddr, // as long as pAddr itself doesn't escape. + // *uring.UDPConn can return netaddr.IPPorts directly. // The default case works, but it allocates. var pAddr *net.UDPAddr switch pconn := pconn.(type) { - case *uring.UDPConn: - n, ipp, err = pconn.ReadFromNetaddr(b) case *net.UDPConn: n, pAddr, err = pconn.ReadFromUDP(b) + case *uring.UDPConn: + n, ipp, err = pconn.ReadFromNetaddr(b) default: var addr net.Addr n, addr, err = pconn.ReadFrom(b)