From 4950fe60bd48ea6cba46ff6c2002a85a9c1ae8b8 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 3 Aug 2022 21:51:02 -0700 Subject: syncs, all: move to using Go's new atomic types instead of ours Fixes #5185 Change-Id: I850dd532559af78c3895e2924f8237ccc328449d Signed-off-by: Brad Fitzpatrick --- control/controlknobs/controlknobs.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'control/controlknobs/controlknobs.go') diff --git a/control/controlknobs/controlknobs.go b/control/controlknobs/controlknobs.go index 5c3c3865c..c5fd28d20 100644 --- a/control/controlknobs/controlknobs.go +++ b/control/controlknobs/controlknobs.go @@ -7,12 +7,13 @@ package controlknobs import ( + "sync/atomic" + "tailscale.com/envknob" - "tailscale.com/syncs" ) // disableUPnP indicates whether to attempt UPnP mapping. -var disableUPnP syncs.AtomicBool +var disableUPnP atomic.Bool func init() { SetDisableUPnP(envknob.Bool("TS_DISABLE_UPNP")) @@ -21,11 +22,11 @@ func init() { // DisableUPnP reports the last reported value from control // whether UPnP portmapping should be disabled. func DisableUPnP() bool { - return disableUPnP.Get() + return disableUPnP.Load() } // SetDisableUPnP sets whether control says that UPnP should be // disabled. func SetDisableUPnP(v bool) { - disableUPnP.Set(v) + disableUPnP.Store(v) } -- cgit v1.3-3-g829e