summaryrefslogtreecommitdiffhomepage
path: root/wgengine/netstack
diff options
context:
space:
mode:
authorAleksandar Pesic <peske.nis@gmail.com>2021-02-17 15:29:21 +0100
committerAleksandar Pesic <peske.nis@gmail.com>2021-02-17 15:29:21 +0100
commit419edfca05a253a44161915bd96c1cc1df5fa163 (patch)
tree86de633a8529d6cc9f275d567d529aecfe4a037b /wgengine/netstack
parent3e2d69a26c407093523edf352744c689ae155d52 (diff)
parent7038c09bc91c7f65ff33afb777187ef9acca214c (diff)
downloadtailscale-peske/elnotfound.tar.xz
tailscale-peske/elnotfound.zip
Merge branch 'main' into peske/elnotfoundpeske/elnotfound
Diffstat (limited to 'wgengine/netstack')
-rw-r--r--wgengine/netstack/netstack.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/wgengine/netstack/netstack.go b/wgengine/netstack/netstack.go
index 72651bd41..b2b21fcba 100644
--- a/wgengine/netstack/netstack.go
+++ b/wgengine/netstack/netstack.go
@@ -28,9 +28,9 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/transport/udp"
"gvisor.dev/gvisor/pkg/waiter"
"inet.af/netaddr"
- "tailscale.com/control/controlclient"
"tailscale.com/net/packet"
"tailscale.com/types/logger"
+ "tailscale.com/types/netmap"
"tailscale.com/wgengine"
"tailscale.com/wgengine/filter"
"tailscale.com/wgengine/magicsock"
@@ -63,7 +63,7 @@ func Impl(logf logger.Logf, tundev *tstun.TUN, e wgengine.Engine, mc *magicsock.
log.Fatal(err)
}
- e.AddNetworkMapCallback(func(nm *controlclient.NetworkMap) {
+ e.AddNetworkMapCallback(func(nm *netmap.NetworkMap) {
oldIPs := make(map[tcpip.Address]bool)
for _, ip := range ipstack.AllAddresses()[nicID] {
oldIPs[ip.AddressWithPrefix.Address] = true