From e470893ba067675b97ce7e68a401084ea42ce9ac Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 31 Aug 2022 13:47:25 -0700 Subject: [PATCH] wgengine/magicsock: use mak in another spot Change-Id: I0a46d6243371ae6d126005a2bd63820cb2d1db6b Signed-off-by: Brad Fitzpatrick --- wgengine/magicsock/magicsock.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index 288839b21..32d531b56 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -2130,13 +2130,11 @@ func (c *Conn) enqueueCallMeMaybe(derpAddr netip.AddrPort, de *endpoint) { if !c.lastEndpointsTime.After(time.Now().Add(-endpointsFreshEnoughDuration)) { c.logf("[v1] magicsock: want call-me-maybe but endpoints stale; restunning") - if c.onEndpointRefreshed == nil { - c.onEndpointRefreshed = map[*endpoint]func(){} - } - c.onEndpointRefreshed[de] = func() { + + mak.Set(&c.onEndpointRefreshed, de, func() { c.logf("[v1] magicsock: STUN done; sending call-me-maybe to %v %v", de.discoShort, de.publicKey.ShortString()) c.enqueueCallMeMaybe(derpAddr, de) - } + }) // TODO(bradfitz): make a new 'reSTUNQuickly' method // that passes down a do-a-lite-netcheck flag down to // netcheck that does 1 (or 2 max) STUN queries