TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-22 12:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

paths: generalize IOSSharedDir to cover Android

Browse Source 
Also fix an error message while here.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur 2021-05-20 14:33:49 +02:00 committed by Brad Fitzpatrick
parent 73adbb7a78
commit adfe8cf41d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipn/ipnlocal/local.go
View File

@ -1821,8 +1821,9 @@ func parseResolver(cfg tailcfg.DNSResolver) (netaddr.IPPort, error) {
// tailscaleVarRoot returns the root directory of Tailscale's writable // tailscaleVarRoot returns the root directory of Tailscale's writable
// storage area. (e.g. "/var/lib/tailscale") // storage area. (e.g. "/var/lib/tailscale")
func tailscaleVarRoot() string { func tailscaleVarRoot() string {
if runtime.GOOS == "ios" { switch runtime.GOOS {
dir, _ := paths.IOSSharedDir.Load().(string) case "ios", "android":
dir, _ := paths.AppSharedDir.Load().(string)
return dir return dir
} }
stateFile := paths.DefaultTailscaledStateFile() stateFile := paths.DefaultTailscaledStateFile()
@ -1926,7 +1927,7 @@ func (b *LocalBackend) initPeerAPIListener() {
// ("peerAPIListeners too low"). // ("peerAPIListeners too low").
continue continue
} }
b.logf("[unexpected] peerapi listen(%q) error: %v", a.IP, err) b.logf("[unexpected] peerapi listen(%q) error: %v", a.IP(), err)
continue continue
} }
} }

4
paths/paths.go
View File

@ -13,9 +13,9 @@ import (
"sync/atomic" "sync/atomic"
) )
// IOSSharedDir is a string set by the iOS app on start // AppSharedDir is a string set by the iOS or Android app on start
// containing a directory we can read/write in. // containing a directory we can read/write in.
var IOSSharedDir atomic.Value var AppSharedDir atomic.Value
// DefaultTailscaledSocket returns the path to the tailscaled Unix socket // DefaultTailscaledSocket returns the path to the tailscaled Unix socket
// or the empty string if there's no reasonable default. // or the empty string if there's no reasonable default.