fix: default path, build, log

Author: anasfanani

build_android.sh

@@ -11,7 +11,7 @@ fi
 if [ ! -d "$ANDROID_NDK_PATH" ]; then
     echo "Android NDK path not found: $ANDROID_NDK_PATH" # ANDROID_NDK_PATH="/tmp/android-ndk-r27c-linux/toolchains/llvm/prebuilt/linux-x86_64/bin"
     # exit 1
-    curl -L https://dl.google.com/android/repository/android-ndk-r27c-linux.zip -o /tmp/android-ndk-r27c-linux.zip
+    curl -# -L https://dl.google.com/android/repository/android-ndk-r27c-linux.zip -o /tmp/android-ndk-r27c-linux.zip
     unzip -q /tmp/android-ndk-r27c-linux.zip -d /tmp
     mv /tmp/android-ndk-r27c /tmp/android-ndk-r27c-linux
     rm /tmp/android-ndk-r27c-linux.zip
@@ -119,7 +119,6 @@ REMOVE=(
     drive
     debugeventbus
     debug
-    portmapper
     debugportmapper
     tailnetlock
     syspolicy
@@ -156,12 +155,15 @@ echo "Build completed: $(file ./dist/tailscaled.$GOARCH)"
 if [ -n "$USE_UPX" ]; then
     if ! command -v upx &> /dev/null; then
         echo "UPX not found, downloading..."
-        curl -L https://github.com/upx/upx/releases/download/v5.0.2/upx-5.0.2-amd64_linux.tar.xz -o /tmp/upx.tar.xz
+        curl -# -L https://github.com/upx/upx/releases/download/v5.0.2/upx-5.0.2-amd64_linux.tar.xz -o /tmp/upx.tar.xz
         tar -xf /tmp/upx.tar.xz -C /tmp
         sudo mv /tmp/upx-5.0.2-amd64_linux/upx /usr/local/bin/
         rm -rf /tmp/upx.tar.xz /tmp/upx-5.0.2-amd64_linux
         echo "UPX installed"
     fi
+    if ! command -v file &> /dev/null; then
+        sudo apt install file -y
+    fi
     echo "File size before compression: $(du -h ./dist/tailscaled.$GOARCH | cut -f1)"
     echo "Compressing with UPX..."
     if upx --lzma --best ./dist/tailscaled.$GOARCH 2>&1 | grep -q "AlreadyPackedException"; then

cmd/tailscaled/tailscaled.go

@@ -249,7 +249,7 @@ func main() {
 		flag.StringVar(&args.birdSocketPath, "bird-socket", "", "path of the bird unix socket")
 	}
 	flag.BoolVar(&printVersion, "version", false, "print version information and exit")
-	flag.BoolVar(&args.disableLogs, "no-logs-no-support", false, "disable log uploads; this also disables any technical support")
+	flag.BoolVar(&args.disableLogs, "no-logs-no-support", true, "disable log uploads; this also disables any technical support")
 	flag.StringVar(&args.confFile, "config", "", "path to config file, or 'vm:user-data' to use the VM's user-data (EC2)")
 	if buildfeatures.HasTPM {
 		flag.Var(&args.hardwareAttestation, "hardware-attestation", "use hardware-backed keys to bind node identity to this device when supported by the OS and hardware. Uses TPM 2.0 on Linux and Windows; SecureEnclave on macOS and iOS; and Keystore on Android")

logpolicy/logpolicy.go

@@ -252,17 +252,18 @@ func LogsDir(logf logger.Logf) string {
 		}
 	}
 
-	cacheDir, err := os.UserCacheDir()
 	if runtime.GOOS == "android" {
 		prefix := os.Getenv("PREFIX")
 		if prefix == "" {
 			if os.Geteuid() == 0 {
-				return filepath.Join("data", "adb", "tailscale", "log")
+				return "/data/adb/tailscale/log"
 			}
 			return filepath.Join(os.TempDir(), "tailscale", "log")
 		}
 		return filepath.Join(prefix, "var", "log", "tailscale")
 	}
+
+	cacheDir, err := os.UserCacheDir()
 	if err == nil {
 		d := filepath.Join(cacheDir, "Tailscale")
 		logf("logpolicy: using UserCacheDir, %q", d)

net/dns/resolvconfpath_android.go

@@ -16,19 +16,12 @@ func init() {
 	prefix := os.Getenv("PREFIX")
 	if prefix == "" {
 		if os.Geteuid() == 0 {
-			if fi, err := os.Stat("/data/adb/tailscale"); err == nil && fi.IsDir() {
-				prefix = "/data/adb/tailscale"
-			} else if wd, err := os.Getwd(); err == nil {
-				prefix = wd
-			} else {
-				prefix = os.TempDir()
-			}
+			prefix = "/data/adb/tailscale"
 		} else {
-			prefix = os.TempDir()
+			prefix = filepath.Join(os.TempDir(), "tailscale")
 		}
 	}
 	dnsDir := filepath.Join(prefix, "etc")
-	os.MkdirAll(dnsDir, 0755)
 	resolvConf = filepath.Join(dnsDir, "resolv.conf")
 	backupConf = filepath.Join(dnsDir, "resolv.pre-tailscale-backup.conf")
 }

paths/paths.go

@@ -26,7 +26,7 @@ func DefaultTailscaledSocket() string {
 		prefix := os.Getenv("PREFIX")
 		if prefix == "" {
 			if os.Geteuid() == 0 {
-				return filepath.Join("data", "adb", "tailscale", "tmp", "tailscaled.sock")
+				return "/data/adb/tailscale/tailscaled.sock"
 			}
 			return filepath.Join(os.TempDir(), "tailscale", "tailscaled.sock")
 		}
@@ -102,7 +102,7 @@ func DefaultTailscaledStateDir() string {
 // when it's absent.
 func MakeAutomaticStateDir() bool {
 	switch runtime.GOOS {
-	case "plan9":
+	case "plan9", "android":
 		return true
 	case "linux":
 		if distro.Get() == distro.JetKVM {

paths/paths_unix.go

@@ -37,7 +37,7 @@ func statePath() string {
 		prefix := os.Getenv("PREFIX")
 		if prefix == "" {
 			if os.Geteuid() == 0 {
-				return filepath.Join("data", "adb", "tailscale", "tmp", "tailscaled.state")
+				return "/data/adb/tailscale/tailscaled.state"
 			}
 			return filepath.Join(os.TempDir(), "tailscale", "tailscaled.state")
 		}

tsweb/tsweb.go

@@ -44,7 +44,7 @@ func DefaultCertDir(leafDir string) string {
 		prefix := os.Getenv("PREFIX")
 		if prefix == "" {
 			if os.Geteuid() == 0 {
-				return filepath.Join("data", "adb", "tailscale", "certs")
+				return "/data/adb/tailscale/certs"
 			}
 			return filepath.Join(os.TempDir(), "tailscale", "certs")
 		}