From b500bbdad659f8098677f4b53830e2c8a57e58c6 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 12 Sep 2023 15:53:37 -0700 Subject: [PATCH] go.mod: bump oss And resulting API changes. Signed-off-by: Brad Fitzpatrick --- cmd/tailscale/backend.go | 9 +++++++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cmd/tailscale/backend.go b/cmd/tailscale/backend.go index fc1ab01..89be8c9 100644 --- a/cmd/tailscale/backend.go +++ b/cmd/tailscale/backend.go @@ -41,6 +41,7 @@ import ( type backend struct { engine wgengine.Engine backend *ipnlocal.LocalBackend + sys *tsd.System devices *multiTUN settings settingsFunc lastCfg *router.Config @@ -146,6 +147,7 @@ func newBackend(dataDir string, jvm *jni.JVM, appCtx jni.Object, store *stateSto if err != nil { return nil, fmt.Errorf("netstack.Create: %w", err) } + sys.Set(ns) ns.ProcessLocalIPs = false // let Android kernel handle it; VpnBuilder sets this up ns.ProcessSubnets = true // for Android-being-an-exit-node support sys.NetstackRouter.Set(true) @@ -162,6 +164,7 @@ func newBackend(dataDir string, jvm *jni.JVM, appCtx jni.Object, store *stateSto } b.engine = engine b.backend = lb + b.sys = sys return b, nil } @@ -171,8 +174,10 @@ func (b *backend) Start(notify func(n ipn.Notify)) error { } func (b *backend) LinkChange() { - if b.engine != nil { - b.engine.LinkChange(false) + if b.sys != nil { + if nm, ok := b.sys.NetMon.GetOK(); ok { + nm.InjectEvent() + } } } diff --git a/go.mod b/go.mod index 81254b4..c9bbab8 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 golang.org/x/sys v0.11.0 inet.af/netaddr v0.0.0-20220617031823-097006376321 - tailscale.com v1.1.1-0.20230906224208-c2241248c881 + tailscale.com v1.1.1-0.20230912221414-727b1432a881 ) require ( diff --git a/go.sum b/go.sum index 966b069..acea2f9 100644 --- a/go.sum +++ b/go.sum @@ -717,5 +717,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= software.sslmate.com/src/go-pkcs12 v0.2.0 h1:nlFkj7bTysH6VkC4fGphtjXRbezREPgrHuJG20hBGPE= software.sslmate.com/src/go-pkcs12 v0.2.0/go.mod h1:23rNcYsMabIc1otwLpTkCCPwUq6kQsTyowttG/as0kQ= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -tailscale.com v1.1.1-0.20230906224208-c2241248c881 h1:x4Z/cEB0GTGQfi5I+ndDdEuQOL8ISuR2jODgBY+ceco= -tailscale.com v1.1.1-0.20230906224208-c2241248c881/go.mod h1:L/6mVRFA/zTI/46+8cHMddZAvb1xf2LTI/LJ/D8CbeM= +tailscale.com v1.1.1-0.20230912221414-727b1432a881 h1:GwhTlkWKIWDRrZndSBytvs7xfhbH2EyA9IGjkMwUoNc= +tailscale.com v1.1.1-0.20230912221414-727b1432a881/go.mod h1:L/6mVRFA/zTI/46+8cHMddZAvb1xf2LTI/LJ/D8CbeM=