From 31b3c725c86fadf08b2ddd1e7d1786d38e9c44e6 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 19 Jun 2020 21:02:17 +0200 Subject: [PATCH] cmd/tailscale: reset cached config when failing to set up VPN tunnel Add a bit of logging while here. Signed-off-by: Elias Naur --- cmd/tailscale/backend.go | 2 +- cmd/tailscale/main.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/tailscale/backend.go b/cmd/tailscale/backend.go index dd68e04..b4ae99e 100644 --- a/cmd/tailscale/backend.go +++ b/cmd/tailscale/backend.go @@ -235,7 +235,7 @@ func (b *backend) updateTUN(service jni.Object, cfg *router.Config) error { return nil }) if err != nil { - b.lastCfg = cfg + b.lastCfg = nil b.CloseTUNs() return err } diff --git a/cmd/tailscale/main.go b/cmd/tailscale/main.go index 00a04f0..3da9044 100644 --- a/cmd/tailscale/main.go +++ b/cmd/tailscale/main.go @@ -193,6 +193,7 @@ func (a *App) runBackend() error { if service != 0 { if cfg != nil && state.State >= ipn.Starting { if err := b.updateTUN(service, cfg); err != nil { + log.Printf("VPN update failed: %v", err) a.notifyVPNClosed() } } else { @@ -253,6 +254,7 @@ func (a *App) runBackend() error { } if cfg != nil && state.State >= ipn.Starting { if err := b.updateTUN(service, cfg); err != nil { + log.Printf("VPN update failed: %v", err) a.notifyVPNClosed() } }