From 6a142b2f50760686886c5d5e81ca374825221fab Mon Sep 17 00:00:00 2001 From: Aaron Klotz Date: Mon, 25 Sep 2023 20:13:55 -0600 Subject: [PATCH] cmd/tailscale: fix OSS build breaks For build #cleanup Signed-off-by: Aaron Klotz --- cmd/tailscale/backend.go | 2 +- cmd/tailscale/ui.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/tailscale/backend.go b/cmd/tailscale/backend.go index 89be8c9..225fa22 100644 --- a/cmd/tailscale/backend.go +++ b/cmd/tailscale/backend.go @@ -143,7 +143,7 @@ func newBackend(dataDir string, jvm *jni.JVM, appCtx jni.Object, store *stateSto } sys.Set(engine) b.logIDPublic = logID.Public().String() - ns, err := netstack.Create(logf, sys.Tun.Get(), engine, sys.MagicSock.Get(), dialer, sys.DNSManager.Get()) + ns, err := netstack.Create(logf, sys.Tun.Get(), engine, sys.MagicSock.Get(), dialer, sys.DNSManager.Get(), sys.ProxyMapper()) if err != nil { return nil, fmt.Errorf("netstack.Create: %w", err) } diff --git a/cmd/tailscale/ui.go b/cmd/tailscale/ui.go index 1b861af..3f2cc62 100644 --- a/cmd/tailscale/ui.go +++ b/cmd/tailscale/ui.go @@ -366,8 +366,8 @@ func (ui *UI) layout(gtx layout.Context, sysIns system.Insets, state *clientStat userID = netmap.User() expiry = netmap.Expiry localName = netmap.SelfNode.DisplayName(false) - if addrs := netmap.Addresses; len(addrs) > 0 { - localAddr = addrs[0].Addr().String() + if addrs := netmap.GetAddresses(); addrs.Len() > 0 { + localAddr = addrs.At(0).Addr().String() } } if p := state.backend.Prefs; p != nil {