TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

safesocket: make ConnectDefault use paths pkg, fixing tailscaled-on-macOS

Browse Source 
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-02-15 11:19:22 -08:00
parent 7e00100a0a
commit dec01ef22b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tailscale/depaware.txt
View File

@ -33,7 +33,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
tailscale.com/net/tlsdial from tailscale.com/derp/derphttp tailscale.com/net/tlsdial from tailscale.com/derp/derphttp
tailscale.com/net/tsaddr from tailscale.com/net/interfaces tailscale.com/net/tsaddr from tailscale.com/net/interfaces
💣 tailscale.com/net/tshttpproxy from tailscale.com/derp/derphttp+ 💣 tailscale.com/net/tshttpproxy from tailscale.com/derp/derphttp+
tailscale.com/paths from tailscale.com/cmd/tailscale/cli tailscale.com/paths from tailscale.com/cmd/tailscale/cli+
tailscale.com/safesocket 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/interfaces+
tailscale.com/tailcfg from tailscale.com/cmd/tailscale/cli+ tailscale.com/tailcfg from tailscale.com/cmd/tailscale/cli+

4
safesocket/safesocket.go
View File

@ -10,6 +10,8 @@ import (
"errors" "errors"
"net" "net"
"runtime" "runtime"
"tailscale.com/paths"
) )
type closeable interface { type closeable interface {
@ -31,7 +33,7 @@ func ConnCloseWrite(c net.Conn) error {
// ConnectDefault connects to the local Tailscale daemon. // ConnectDefault connects to the local Tailscale daemon.
func ConnectDefault() (net.Conn, error) { func ConnectDefault() (net.Conn, error) {
return Connect("/var/run/tailscale/tailscaled.sock", 41112) return Connect(paths.DefaultTailscaledSocket(), 41112)
} }
// Connect connects to either path (on Unix) or the provided localhost port (on Windows). // Connect connects to either path (on Unix) or the provided localhost port (on Windows).