Makefile: update go version for bumposs

Updates tailscale/tailscale#10992

Signed-off-by: kari-ts <kari@tailscale.com>

Makefile

@@ -84,7 +84,7 @@ tag_release:
 
 bumposs: toolchain
 	GOPROXY=direct go get tailscale.com@main
-	go mod tidy -compat=1.21
+	go mod tidy -compat=1.22
 
 $(TOOLCHAINDIR)/bin/go:
 	@if ! echo $(TOOLCHAINDIR) | grep -q 'tailscale-android-go'; then \

cmd/tailscale/backend.go

@@ -151,7 +151,7 @@ func newBackend(dataDir string, jvm *jni.JVM, appCtx jni.Object, store *stateSto
 	}
 	sys.Set(engine)
 	b.logIDPublic = logID.Public()
-	ns, err := netstack.Create(logf, sys.Tun.Get(), engine, sys.MagicSock.Get(), dialer, sys.DNSManager.Get(), sys.ProxyMapper())
+	ns, err := netstack.Create(logf, sys.Tun.Get(), engine, sys.MagicSock.Get(), dialer, sys.DNSManager.Get(), sys.ProxyMapper(), nil)
 	if err != nil {
 		return nil, fmt.Errorf("netstack.Create: %w", err)
 	}

cmd/tailscale/main.go

@@ -457,7 +457,6 @@ func (a *App) runBackend(ctx context.Context) error {
 				state.Prefs.ExitNodeAllowLANAccess = bool(e)
 				go b.backend.SetPrefs(state.Prefs)
 			case WebAuthEvent:
-				log.Printf("KARI WEBAUTHEVENT")
 				if !signingIn {
 					go a.login(ctx)
 					signingIn = true
@@ -475,11 +474,7 @@ func (a *App) runBackend(ctx context.Context) error {
 					}
 				}()
 			case LogoutEvent:
-				go func() {
-					ctx, cancel := context.WithTimeout(ctx, 5*time.Minute)
-					defer cancel()
-					b.backend.Logout(ctx)
-				}()
+				go a.logout(ctx)
 			case ConnectEvent:
 				state.Prefs.WantRunning = e.Enable
 				go b.backend.SetPrefs(state.Prefs)
@@ -571,7 +566,7 @@ func (a *App) runBackend(ctx context.Context) error {
 }
 
 func (a *App) getBugReportID(ctx context.Context, bugReportChan chan<- string, fallbackLog string) {
-	ctx, cancel := context.WithDeadline(ctx, time.Now().Add(2*time.Second))
+	ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
 	defer cancel()
 	r, err := a.localAPIClient.Call(ctx, "POST", "bugreport", nil)
 	defer r.Body().Close()
@@ -591,7 +586,7 @@ func (a *App) getBugReportID(ctx context.Context, bugReportChan chan<- string, f
 }
 
 func (a *App) login(ctx context.Context) {
-	ctx, cancel := context.WithDeadline(ctx, time.Now().Add(2*time.Second))
+	ctx, cancel := context.WithTimeout(ctx, 60*time.Second)
 	defer cancel()
 	r, err := a.localAPIClient.Call(ctx, "POST", "login-interactive", nil)
 	defer r.Body().Close()
@@ -602,6 +597,22 @@ func (a *App) login(ctx context.Context) {
 	}
 }
 
+func (a *App) logout(ctx context.Context) error {
+	ctx, cancel := context.WithTimeout(ctx, 60*time.Second)
+	defer cancel()
+	r, err := a.localAPIClient.Call(ctx, "POST", "logout", nil)
+	defer r.Body().Close()
+
+	if err != nil {
+		log.Printf("logout: %s", err)
+		logoutctx, logoutcancel := context.WithTimeout(ctx, 5*time.Minute)
+		defer logoutcancel()
+		a.backend.Logout(logoutctx)
+	}
+
+	return err
+}
+
 func (a *App) processWaitingFiles(b *ipnlocal.LocalBackend) error {
 	files, err := b.WaitingFiles()
 	if err != nil {