From 93afdf1e5d8034c9db8a01cc5eefd7b8112f7eb9 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 24 Jul 2020 22:10:45 +0200 Subject: [PATCH] cmd/tailscale: bump tailscale version Signed-off-by: Elias Naur --- cmd/tailscale/backend.go | 4 ++-- go.mod | 4 ++-- go.sum | 14 ++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cmd/tailscale/backend.go b/cmd/tailscale/backend.go index 036906d..b295fa8 100644 --- a/cmd/tailscale/backend.go +++ b/cmd/tailscale/backend.go @@ -170,7 +170,7 @@ func (b *backend) updateTUN(service jni.Object, cfg *router.Config) error { // builder.addDnsServer addDnsServer := jni.GetMethodID(env, bcls, "addDnsServer", "(Ljava/lang/String;)Landroid/net/VpnService$Builder;") - for _, dns := range cfg.DNS { + for _, dns := range cfg.Nameservers { _, err = jni.CallObjectMethod(env, builder, addDnsServer, @@ -183,7 +183,7 @@ func (b *backend) updateTUN(service jni.Object, cfg *router.Config) error { // builder.addSearchDomain. addSearchDomain := jni.GetMethodID(env, bcls, "addSearchDomain", "(Ljava/lang/String;)Landroid/net/VpnService$Builder;") - for _, dom := range cfg.DNSDomains { + for _, dom := range cfg.Domains { _, err = jni.CallObjectMethod(env, builder, addSearchDomain, diff --git a/go.mod b/go.mod index 3d1d2d8..fad3aed 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,9 @@ require ( gioui.org v0.0.0-20200724173311-4a9d97784f24 gioui.org/cmd v0.0.0-20200622185735-5bd0ecea5e43 github.com/go-bindata/go-bindata v3.1.2+incompatible - github.com/tailscale/wireguard-go v0.0.0-20200710044538-9320f191f6b1 + github.com/tailscale/wireguard-go v0.0.0-20200724155040-d554a2a5e7e1 golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/sys v0.0.0-20200501052902-10377860bb8e - tailscale.com v0.100.1-0.20200714110936-6e8f0860af16 + tailscale.com v0.100.1-0.20200724211229-0a42b0a72666 ) diff --git a/go.sum b/go.sum index 4c44fd6..ee658b3 100644 --- a/go.sum +++ b/go.sum @@ -39,6 +39,8 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= @@ -82,8 +84,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/tailscale/winipcfg-go v0.0.0-20200413171540-609dcf2df55f h1:uFj5bslHsMzxIM8UTjAhq4VXeo6GfNW91rpoh/WMJaY= github.com/tailscale/winipcfg-go v0.0.0-20200413171540-609dcf2df55f/go.mod h1:x880GWw5fvrl2DVTQ04ttXQD4DuppTt1Yz6wLibbjNE= -github.com/tailscale/wireguard-go v0.0.0-20200710044538-9320f191f6b1 h1:zMEeWu/X0l+xFnsbri69miflb3HIKoLwedZHD5xx6Mk= -github.com/tailscale/wireguard-go v0.0.0-20200710044538-9320f191f6b1/go.mod h1:JPm5cTfu1K+qDFRbiHy0sOlHUylYQbpl356sdYFD8V4= +github.com/tailscale/wireguard-go v0.0.0-20200724155040-d554a2a5e7e1 h1:Ga895WFYzI9VOXyps7t9ax9P5zSKsP5Yqpiv2euuyeU= +github.com/tailscale/wireguard-go v0.0.0-20200724155040-d554a2a5e7e1/go.mod h1:JPm5cTfu1K+qDFRbiHy0sOlHUylYQbpl356sdYFD8V4= github.com/tcnksm/go-httpstat v0.2.0 h1:rP7T5e5U2HfmOBmZzGgGZjBQ5/GluWUylujl0tJ04I0= github.com/tcnksm/go-httpstat v0.2.0/go.mod h1:s3JVJFtQxtBEBC9dwcdTTXS9xFnM3SXAZwPG41aurT8= github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM= @@ -171,9 +173,9 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -inet.af/netaddr v0.0.0-20200706235120-1ac1a40fae99 h1:+43CBpWlrXThaOxixPS5JXEJZC8zaMCpDu3aKffe0bs= -inet.af/netaddr v0.0.0-20200706235120-1ac1a40fae99/go.mod h1:qqYzz/2whtrbWJvt+DNWQyvekNN4ePQZcg2xc2/Yjww= +inet.af/netaddr v0.0.0-20200718043157-99321d6ad24c h1:si3Owrfem175Ry6gKqnh59eOXxDojyBTIHxUKuvK/Eo= +inet.af/netaddr v0.0.0-20200718043157-99321d6ad24c/go.mod h1:qqYzz/2whtrbWJvt+DNWQyvekNN4ePQZcg2xc2/Yjww= rsc.io/goversion v1.2.0 h1:SPn+NLTiAG7w30IRK/DKp1BjvpWabYgxlLp/+kx5J8w= rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo= -tailscale.com v0.100.1-0.20200714110936-6e8f0860af16 h1:hqg6wZROa8WAOuu9LixQ3noP1jcwNGQ905oVLokLomM= -tailscale.com v0.100.1-0.20200714110936-6e8f0860af16/go.mod h1:DhGL1cI2RUCfW9XiZ6t/5vTDDqXcYoUudqmNCM6SkmI= +tailscale.com v0.100.1-0.20200724211229-0a42b0a72666 h1:U4Jv6EAusLfOmNQmjgstVaIhtIB38onIcnx8D3a6dH4= +tailscale.com v0.100.1-0.20200724211229-0a42b0a72666/go.mod h1:Kd8ZmpqLwkW+e93RsM0D2Txa4bKyJh7HIUSurTZjwP8=