diff --git a/android/build.gradle b/android/build.gradle index 5d76288..30fde91 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,7 +26,7 @@ android { defaultConfig { minSdkVersion 22 targetSdkVersion 30 - versionCode 134 + versionCode 135 versionName "1.32.2-t54e8fa172-gd9ef1cad8ab" } compileOptions { diff --git a/cmd/tailscale/main.go b/cmd/tailscale/main.go index 4d18283..1c2e9af 100644 --- a/cmd/tailscale/main.go +++ b/cmd/tailscale/main.go @@ -349,9 +349,9 @@ func (a *App) runBackend() error { configErrs <- b.updateTUN(service, cfg.rcfg, cfg.dcfg) case n := <-notifications: exitWasOnline := state.ExitStatus == ExitOnline - if p := n.Prefs; p != nil { + if p := n.Prefs; p != nil && p.Valid() { first := state.Prefs == nil - state.Prefs = p.Clone() + state.Prefs = p.AsStruct() state.updateExitNodes() if first { state.Prefs.Hostname = a.hostname() diff --git a/go.mod b/go.mod index f769773..4492862 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 golang.zx2c4.com/wireguard v0.0.0-20220904105730-b51010ba13f0 inet.af/netaddr v0.0.0-20220617031823-097006376321 - tailscale.com v1.32.2 + tailscale.com v1.32.3 ) require ( diff --git a/go.sum b/go.sum index 75d0049..fcd3cd9 100644 --- a/go.sum +++ b/go.sum @@ -687,5 +687,5 @@ nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= software.sslmate.com/src/go-pkcs12 v0.0.0-20210415151418-c5206de65a78 h1:SqYE5+A2qvRhErbsXFfUEUmpWEKxxRSMgGLkvRAFOV4= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -tailscale.com v1.32.2 h1:bTYbeNPhC3OBH0g5kYWXBEoUOiEsNYf0WSvsvFsYlB0= -tailscale.com v1.32.2/go.mod h1:AwKk+tI7z1+EXzmLxVNXA4dBpgTKd6RVV1VjFYEiv94= +tailscale.com v1.32.3 h1:zQbS6xdJzk8SXcUxG6kPo+4aDqXByeP7NjivNpnTN+c= +tailscale.com v1.32.3/go.mod h1:AwKk+tI7z1+EXzmLxVNXA4dBpgTKd6RVV1VjFYEiv94=