summaryrefslogtreecommitdiffhomepage
path: root/net/interfaces
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@tailscale.com>2022-08-03 21:51:02 -0700
committerBrad Fitzpatrick <bradfitz@tailscale.com>2022-08-03 21:51:42 -0700
commit698defd54b4128eaa8278ff4ef1e15370682f1fe (patch)
treedb4eadf5e0cacc3176ee4e26511a3ef28a8dbd38 /net/interfaces
parentc378a9900c56b33b6f7174894d8261d189e97185 (diff)
downloadtailscale-bradfitz/appendf.tar.xz
tailscale-bradfitz/appendf.zip
syncs, all: move to using Go's new atomic types instead of oursbradfitz/appendf
Fixes #5185 Change-Id: I850dd532559af78c3895e2924f8237ccc328449d Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Diffstat (limited to 'net/interfaces')
-rw-r--r--net/interfaces/interfaces_linux.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/interfaces/interfaces_linux.go b/net/interfaces/interfaces_linux.go
index 73c5ff22e..316b5a951 100644
--- a/net/interfaces/interfaces_linux.go
+++ b/net/interfaces/interfaces_linux.go
@@ -17,13 +17,13 @@ import (
"os/exec"
"runtime"
"strings"
+ "sync/atomic"
"github.com/jsimonetti/rtnetlink"
"github.com/mdlayher/netlink"
"go4.org/mem"
"golang.org/x/sys/unix"
"tailscale.com/net/netaddr"
- "tailscale.com/syncs"
"tailscale.com/util/lineread"
)
@@ -31,7 +31,7 @@ func init() {
likelyHomeRouterIP = likelyHomeRouterIPLinux
}
-var procNetRouteErr syncs.AtomicBool
+var procNetRouteErr atomic.Bool
// errStopReading is a sentinel error value used internally by
// lineread.File callers to stop reading. It doesn't escape to
@@ -47,7 +47,7 @@ ens18 00000000 0100000A 0003 0 0 0 00000000
ens18 0000000A 00000000 0001 0 0 0 0000FFFF 0 0 0
*/
func likelyHomeRouterIPLinux() (ret netip.Addr, ok bool) {
- if procNetRouteErr.Get() {
+ if procNetRouteErr.Load() {
// If we failed to read /proc/net/route previously, don't keep trying.
// But if we're on Android, go into the Android path.
if runtime.GOOS == "android" {
@@ -93,7 +93,7 @@ func likelyHomeRouterIPLinux() (ret netip.Addr, ok bool) {
err = nil
}
if err != nil {
- procNetRouteErr.Set(true)
+ procNetRouteErr.Store(true)
if runtime.GOOS == "android" {
return likelyHomeRouterIPAndroid()
}