From 9f7f2af0085f1564d3698edad0fcde421345b80c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 25 Mar 2021 15:30:05 -0700 Subject: [PATCH] wgengine/router/dns: move to net/dns. Preparation for merging the APIs and whatnot. Signed-off-by: David Anderson --- cmd/tailscaled/depaware.txt | 7 +++---- internal/deepprint/deepprint_test.go | 2 +- ipn/ipnlocal/local.go | 3 +-- {wgengine/router => net}/dns/config.go | 0 {wgengine/router => net}/dns/direct.go | 0 {wgengine/router => net}/dns/manager.go | 0 {wgengine/router => net}/dns/manager_default.go | 0 {wgengine/router => net}/dns/manager_freebsd.go | 0 {wgengine/router => net}/dns/manager_linux.go | 0 {wgengine/router => net}/dns/manager_openbsd.go | 0 {wgengine/router => net}/dns/manager_windows.go | 0 {wgengine/router => net}/dns/nm.go | 0 {wgengine/router => net}/dns/noop.go | 0 {wgengine/router => net}/dns/registry_windows.go | 0 {wgengine/router => net}/dns/resolvconf.go | 0 {wgengine/router => net}/dns/resolved.go | 0 wgengine/router/router.go | 2 +- wgengine/router/router_linux.go | 2 +- wgengine/router/router_openbsd.go | 2 +- wgengine/router/router_userspace_bsd.go | 2 +- wgengine/router/router_windows.go | 2 +- 21 files changed, 10 insertions(+), 12 deletions(-) rename {wgengine/router => net}/dns/config.go (100%) rename {wgengine/router => net}/dns/direct.go (100%) rename {wgengine/router => net}/dns/manager.go (100%) rename {wgengine/router => net}/dns/manager_default.go (100%) rename {wgengine/router => net}/dns/manager_freebsd.go (100%) rename {wgengine/router => net}/dns/manager_linux.go (100%) rename {wgengine/router => net}/dns/manager_openbsd.go (100%) rename {wgengine/router => net}/dns/manager_windows.go (100%) rename {wgengine/router => net}/dns/nm.go (100%) rename {wgengine/router => net}/dns/noop.go (100%) rename {wgengine/router => net}/dns/registry_windows.go (100%) rename {wgengine/router => net}/dns/resolvconf.go (100%) rename {wgengine/router => net}/dns/resolved.go (100%) diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index 0d9df8cd8..bfabd1935 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -6,7 +6,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de github.com/go-multierror/multierror from tailscale.com/wgengine/router+ W 💣 github.com/go-ole/go-ole from github.com/go-ole/go-ole/oleutil+ W 💣 github.com/go-ole/go-ole/oleutil from tailscale.com/wgengine/winnet - L 💣 github.com/godbus/dbus/v5 from tailscale.com/wgengine/router/dns + L 💣 github.com/godbus/dbus/v5 from tailscale.com/net/dns github.com/google/btree from inet.af/netstack/tcpip/header+ L github.com/josharian/native from github.com/mdlayher/netlink+ L 💣 github.com/jsimonetti/rtnetlink from tailscale.com/wgengine/monitor @@ -88,6 +88,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/logtail/backoff from tailscale.com/control/controlclient+ tailscale.com/logtail/filch from tailscale.com/logpolicy tailscale.com/metrics from tailscale.com/derp + tailscale.com/net/dns from tailscale.com/ipn/ipnlocal+ tailscale.com/net/dnscache from tailscale.com/control/controlclient+ tailscale.com/net/dnsfallback from tailscale.com/control/controlclient tailscale.com/net/flowtrack from tailscale.com/wgengine/filter+ @@ -125,7 +126,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/types/strbuilder from tailscale.com/net/packet tailscale.com/types/structs from tailscale.com/control/controlclient+ tailscale.com/types/wgkey from tailscale.com/control/controlclient+ - tailscale.com/util/dnsname from tailscale.com/wgengine/tsdns+ + tailscale.com/util/dnsname from tailscale.com/ipn/ipnstate+ LW tailscale.com/util/endian from tailscale.com/net/netns+ L tailscale.com/util/lineread from tailscale.com/control/controlclient+ tailscale.com/util/pidowner from tailscale.com/ipn/ipnserver @@ -140,8 +141,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/wgengine/monitor from tailscale.com/wgengine+ tailscale.com/wgengine/netstack from tailscale.com/cmd/tailscaled tailscale.com/wgengine/router from tailscale.com/cmd/tailscaled+ - tailscale.com/wgengine/router/dns from tailscale.com/ipn/ipnlocal+ - tailscale.com/wgengine/tsdns from tailscale.com/ipn/ipnlocal+ tailscale.com/wgengine/tstun from tailscale.com/wgengine+ tailscale.com/wgengine/wgcfg from tailscale.com/ipn/ipnlocal+ tailscale.com/wgengine/wgcfg/nmcfg from tailscale.com/ipn/ipnlocal diff --git a/internal/deepprint/deepprint_test.go b/internal/deepprint/deepprint_test.go index e5b2b0924..043562eea 100644 --- a/internal/deepprint/deepprint_test.go +++ b/internal/deepprint/deepprint_test.go @@ -10,7 +10,7 @@ import ( "inet.af/netaddr" "tailscale.com/wgengine/router" - "tailscale.com/wgengine/router/dns" + "tailscale.com/net/dns" "tailscale.com/wgengine/wgcfg" ) diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 245c50b76..c2714afff 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -38,7 +38,6 @@ import ( "tailscale.com/wgengine" "tailscale.com/wgengine/filter" "tailscale.com/wgengine/router" - rdns "tailscale.com/wgengine/router/dns" "tailscale.com/wgengine/wgcfg" "tailscale.com/wgengine/wgcfg/nmcfg" ) @@ -1420,7 +1419,7 @@ func (b *LocalBackend) authReconfig() { b.logf("[unexpected] dns proxied but no nameservers") proxied = false } - rcfg.DNS = rdns.Config{ + rcfg.DNS = dns.Config{ Nameservers: nm.DNS.Nameservers, Domains: nm.DNS.Domains, PerDomain: nm.DNS.PerDomain, diff --git a/wgengine/router/dns/config.go b/net/dns/config.go similarity index 100% rename from wgengine/router/dns/config.go rename to net/dns/config.go diff --git a/wgengine/router/dns/direct.go b/net/dns/direct.go similarity index 100% rename from wgengine/router/dns/direct.go rename to net/dns/direct.go diff --git a/wgengine/router/dns/manager.go b/net/dns/manager.go similarity index 100% rename from wgengine/router/dns/manager.go rename to net/dns/manager.go diff --git a/wgengine/router/dns/manager_default.go b/net/dns/manager_default.go similarity index 100% rename from wgengine/router/dns/manager_default.go rename to net/dns/manager_default.go diff --git a/wgengine/router/dns/manager_freebsd.go b/net/dns/manager_freebsd.go similarity index 100% rename from wgengine/router/dns/manager_freebsd.go rename to net/dns/manager_freebsd.go diff --git a/wgengine/router/dns/manager_linux.go b/net/dns/manager_linux.go similarity index 100% rename from wgengine/router/dns/manager_linux.go rename to net/dns/manager_linux.go diff --git a/wgengine/router/dns/manager_openbsd.go b/net/dns/manager_openbsd.go similarity index 100% rename from wgengine/router/dns/manager_openbsd.go rename to net/dns/manager_openbsd.go diff --git a/wgengine/router/dns/manager_windows.go b/net/dns/manager_windows.go similarity index 100% rename from wgengine/router/dns/manager_windows.go rename to net/dns/manager_windows.go diff --git a/wgengine/router/dns/nm.go b/net/dns/nm.go similarity index 100% rename from wgengine/router/dns/nm.go rename to net/dns/nm.go diff --git a/wgengine/router/dns/noop.go b/net/dns/noop.go similarity index 100% rename from wgengine/router/dns/noop.go rename to net/dns/noop.go diff --git a/wgengine/router/dns/registry_windows.go b/net/dns/registry_windows.go similarity index 100% rename from wgengine/router/dns/registry_windows.go rename to net/dns/registry_windows.go diff --git a/wgengine/router/dns/resolvconf.go b/net/dns/resolvconf.go similarity index 100% rename from wgengine/router/dns/resolvconf.go rename to net/dns/resolvconf.go diff --git a/wgengine/router/dns/resolved.go b/net/dns/resolved.go similarity index 100% rename from wgengine/router/dns/resolved.go rename to net/dns/resolved.go diff --git a/wgengine/router/router.go b/wgengine/router/router.go index 9c3f1003f..3d8bf1574 100644 --- a/wgengine/router/router.go +++ b/wgengine/router/router.go @@ -12,7 +12,7 @@ import ( "inet.af/netaddr" "tailscale.com/types/logger" "tailscale.com/types/preftype" - "tailscale.com/wgengine/router/dns" + "tailscale.com/net/dns" ) // Router is responsible for managing the system network stack. diff --git a/wgengine/router/router_linux.go b/wgengine/router/router_linux.go index b700efccc..3d9dfcf41 100644 --- a/wgengine/router/router_linux.go +++ b/wgengine/router/router_linux.go @@ -23,7 +23,7 @@ import ( "tailscale.com/types/logger" "tailscale.com/types/preftype" "tailscale.com/version/distro" - "tailscale.com/wgengine/router/dns" + "tailscale.com/net/dns" ) const ( diff --git a/wgengine/router/router_openbsd.go b/wgengine/router/router_openbsd.go index 8c7269658..aecf42496 100644 --- a/wgengine/router/router_openbsd.go +++ b/wgengine/router/router_openbsd.go @@ -14,7 +14,7 @@ import ( "github.com/tailscale/wireguard-go/tun" "inet.af/netaddr" "tailscale.com/types/logger" - "tailscale.com/wgengine/router/dns" + "tailscale.com/net/dns" ) // For now this router only supports the WireGuard userspace implementation. diff --git a/wgengine/router/router_userspace_bsd.go b/wgengine/router/router_userspace_bsd.go index 71ccd1706..f89a3e5f1 100644 --- a/wgengine/router/router_userspace_bsd.go +++ b/wgengine/router/router_userspace_bsd.go @@ -17,7 +17,7 @@ import ( "inet.af/netaddr" "tailscale.com/types/logger" "tailscale.com/version" - "tailscale.com/wgengine/router/dns" + "tailscale.com/net/dns" ) type userspaceBSDRouter struct { diff --git a/wgengine/router/router_windows.go b/wgengine/router/router_windows.go index 89c686b95..935ab77db 100644 --- a/wgengine/router/router_windows.go +++ b/wgengine/router/router_windows.go @@ -23,7 +23,7 @@ import ( "inet.af/netaddr" "tailscale.com/logtail/backoff" "tailscale.com/types/logger" - "tailscale.com/wgengine/router/dns" + "tailscale.com/net/dns" ) type winRouter struct {