diff options
| author | Brad Fitzpatrick <bradfitz@tailscale.com> | 2022-08-03 21:51:02 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@tailscale.com> | 2022-08-03 21:51:42 -0700 |
| commit | 698defd54b4128eaa8278ff4ef1e15370682f1fe (patch) | |
| tree | db4eadf5e0cacc3176ee4e26511a3ef28a8dbd38 /cmd | |
| parent | c378a9900c56b33b6f7174894d8261d189e97185 (diff) | |
| download | tailscale-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 'cmd')
| -rw-r--r-- | cmd/tailscale/cli/cli.go | 4 | ||||
| -rw-r--r-- | cmd/tailscale/depaware.txt | 2 | ||||
| -rw-r--r-- | cmd/tailscaled/depaware.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/tailscale/cli/cli.go b/cmd/tailscale/cli/cli.go index fa76ba33e..bd36bf25f 100644 --- a/cmd/tailscale/cli/cli.go +++ b/cmd/tailscale/cli/cli.go @@ -20,6 +20,7 @@ import ( "strconv" "strings" "sync" + "sync/atomic" "syscall" "text/tabwriter" @@ -29,7 +30,6 @@ import ( "tailscale.com/ipn" "tailscale.com/paths" "tailscale.com/safesocket" - "tailscale.com/syncs" "tailscale.com/version/distro" ) @@ -230,7 +230,7 @@ var rootArgs struct { socket string } -var gotSignal syncs.AtomicBool +var gotSignal atomic.Bool func connect(ctx context.Context) (net.Conn, *ipn.BackendClient, context.Context, context.CancelFunc) { s := safesocket.DefaultConnectionStrategy(rootArgs.socket) diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index 803642e73..4351e60a9 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -71,7 +71,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep 💣 tailscale.com/net/tshttpproxy from tailscale.com/derp/derphttp+ tailscale.com/paths from tailscale.com/cmd/tailscale/cli+ tailscale.com/safesocket from tailscale.com/cmd/tailscale/cli+ - tailscale.com/syncs from tailscale.com/net/interfaces+ + tailscale.com/syncs from tailscale.com/net/netcheck tailscale.com/tailcfg from tailscale.com/cmd/tailscale/cli+ tailscale.com/tka from tailscale.com/types/key W tailscale.com/tsconst from tailscale.com/net/interfaces diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index 9dabcd918..6aefa3040 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -241,7 +241,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/safesocket from tailscale.com/client/tailscale+ tailscale.com/smallzstd from tailscale.com/ipn/ipnserver+ LD 💣 tailscale.com/ssh/tailssh from tailscale.com/cmd/tailscaled - tailscale.com/syncs from tailscale.com/control/controlknobs+ + tailscale.com/syncs from tailscale.com/net/netcheck+ tailscale.com/tailcfg from tailscale.com/client/tailscale/apitype+ LD tailscale.com/tempfork/gliderlabs/ssh from tailscale.com/ssh/tailssh tailscale.com/tka from tailscale.com/types/key+ |
