From 7697c9d3000287405277bbe636c8196c1fa05611 Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Sat, 7 May 2022 21:20:57 -0700 Subject: [PATCH] go.mod: update OSS to main@HEAD. Signed-off-by: Denton Gentry --- cmd/tailscale/backend.go | 4 ++-- go.mod | 4 ++-- go.sum | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/tailscale/backend.go b/cmd/tailscale/backend.go index df7955a..424f4a4 100644 --- a/cmd/tailscale/backend.go +++ b/cmd/tailscale/backend.go @@ -121,11 +121,11 @@ func newBackend(dataDir string, jvm *jni.JVM, appCtx jni.Object, store *stateSto return nil, fmt.Errorf("runBackend: NewUserspaceEngine: %v", err) } b.logIDPublic = logID.Public().String() - tunDev, magicConn, ok := engine.(wgengine.InternalsGetter).GetInternals() + tunDev, magicConn, dnsMgr, ok := engine.(wgengine.InternalsGetter).GetInternals() if !ok { return nil, fmt.Errorf("%T is not a wgengine.InternalsGetter", engine) } - ns, err := netstack.Create(logf, tunDev, engine, magicConn, dialer) + ns, err := netstack.Create(logf, tunDev, engine, magicConn, dialer, dnsMgr) if err != nil { return nil, fmt.Errorf("netstack.Create: %w", err) } diff --git a/go.mod b/go.mod index 438b882..ce6bc0d 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 golang.zx2c4.com/wireguard v0.0.0-20220317000134-95b48cdb3961 inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 - tailscale.com v1.1.1-0.20220430025040-e3619b890c20 + tailscale.com v1.1.1-0.20220506211610-741ae9956e67 ) require ( @@ -30,7 +30,7 @@ require ( github.com/godbus/dbus/v5 v5.0.6 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/btree v1.0.1 // indirect - github.com/google/go-cmp v0.5.7 // indirect + github.com/google/go-cmp v0.5.8 // indirect github.com/insomniacslk/dhcp v0.0.0-20211209223715-7d93572ebe8e // indirect github.com/josharian/native v1.0.0 // indirect github.com/jsimonetti/rtnetlink v1.1.2-0.20220408201609-d380b505068b // indirect diff --git a/go.sum b/go.sum index 446f348..0dc785c 100644 --- a/go.sum +++ b/go.sum @@ -181,6 +181,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -780,3 +781,5 @@ tailscale.com v1.1.1-0.20220423065216-bbca2c78cbd0 h1:A/Vhsbrl3xlznK4/lRZIFfp1GQ tailscale.com v1.1.1-0.20220423065216-bbca2c78cbd0/go.mod h1:5yjfQLg8gHScx/9S/SX0sim5sUKkk14HdATuAUHxGmA= tailscale.com v1.1.1-0.20220430025040-e3619b890c20 h1:NTk7u7/6JiaJV1dcOtqwPE+zREKmFfHnFK/wAFabA3Y= tailscale.com v1.1.1-0.20220430025040-e3619b890c20/go.mod h1:SjELlTggz8Lsgebu1kjfOoG+ZpYAr6t8qaxohrIPSLk= +tailscale.com v1.1.1-0.20220506211610-741ae9956e67 h1:9kjMCMfJfTKJm53Ox9/1bQoLIvtYe2grCJG2d9Q00ms= +tailscale.com v1.1.1-0.20220506211610-741ae9956e67/go.mod h1:2TUB66uN02iBFIH9XH3U8huzMuiulhMkWEBLOtP/L4I=