diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index c7a593a4a..895278662 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -57,6 +57,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep 💣 tailscale.com/net/interfaces from tailscale.com/cmd/tailscale/cli+ tailscale.com/net/netcheck from tailscale.com/cmd/tailscale/cli+ 💣 tailscale.com/net/netns from tailscale.com/control/controlclient+ + tailscale.com/net/packet from tailscale.com/wgengine+ tailscale.com/net/stun from tailscale.com/net/netcheck+ tailscale.com/net/tlsdial from tailscale.com/control/controlclient+ tailscale.com/net/tsaddr from tailscale.com/ipn+ @@ -73,7 +74,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep tailscale.com/types/logger from tailscale.com/cmd/tailscale/cli+ tailscale.com/types/nettype from tailscale.com/wgengine/magicsock tailscale.com/types/opt from tailscale.com/control/controlclient+ - tailscale.com/types/strbuilder from tailscale.com/wgengine/packet + tailscale.com/types/strbuilder from tailscale.com/net/packet tailscale.com/types/structs from tailscale.com/control/controlclient+ tailscale.com/util/lineread from tailscale.com/control/controlclient+ tailscale.com/version from tailscale.com/cmd/tailscale/cli+ @@ -82,7 +83,6 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep tailscale.com/wgengine/filter from tailscale.com/control/controlclient+ tailscale.com/wgengine/magicsock from tailscale.com/wgengine 💣 tailscale.com/wgengine/monitor from tailscale.com/cmd/tailscale/cli+ - tailscale.com/wgengine/packet from tailscale.com/wgengine+ tailscale.com/wgengine/router from tailscale.com/cmd/tailscale/cli+ 💣 tailscale.com/wgengine/router/dns from tailscale.com/ipn+ tailscale.com/wgengine/tsdns from tailscale.com/ipn+ diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index 7124aec97..43258fd04 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -63,6 +63,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/net/netcheck from tailscale.com/wgengine/magicsock 💣 tailscale.com/net/netns from tailscale.com/control/controlclient+ 💣 tailscale.com/net/netstat from tailscale.com/ipn/ipnserver + tailscale.com/net/packet from tailscale.com/wgengine+ tailscale.com/net/stun from tailscale.com/net/netcheck+ tailscale.com/net/tlsdial from tailscale.com/control/controlclient+ tailscale.com/net/tsaddr from tailscale.com/ipn+ @@ -81,7 +82,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/types/logger from tailscale.com/cmd/tailscaled+ tailscale.com/types/nettype from tailscale.com/wgengine/magicsock tailscale.com/types/opt from tailscale.com/control/controlclient+ - tailscale.com/types/strbuilder from tailscale.com/wgengine/packet + tailscale.com/types/strbuilder from tailscale.com/net/packet tailscale.com/types/structs from tailscale.com/control/controlclient+ tailscale.com/util/lineread from tailscale.com/control/controlclient+ tailscale.com/util/pidowner from tailscale.com/ipn/ipnserver @@ -91,7 +92,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/wgengine/filter from tailscale.com/control/controlclient+ tailscale.com/wgengine/magicsock from tailscale.com/cmd/tailscaled+ 💣 tailscale.com/wgengine/monitor from tailscale.com/wgengine - tailscale.com/wgengine/packet from tailscale.com/wgengine+ tailscale.com/wgengine/router from tailscale.com/cmd/tailscaled+ 💣 tailscale.com/wgengine/router/dns from tailscale.com/ipn+ tailscale.com/wgengine/tsdns from tailscale.com/ipn+ diff --git a/wgengine/packet/doc.go b/net/packet/doc.go similarity index 100% rename from wgengine/packet/doc.go rename to net/packet/doc.go diff --git a/wgengine/packet/header.go b/net/packet/header.go similarity index 100% rename from wgengine/packet/header.go rename to net/packet/header.go diff --git a/wgengine/packet/icmp4.go b/net/packet/icmp4.go similarity index 100% rename from wgengine/packet/icmp4.go rename to net/packet/icmp4.go diff --git a/wgengine/packet/ip4.go b/net/packet/ip4.go similarity index 100% rename from wgengine/packet/ip4.go rename to net/packet/ip4.go diff --git a/wgengine/packet/packet.go b/net/packet/packet.go similarity index 100% rename from wgengine/packet/packet.go rename to net/packet/packet.go diff --git a/wgengine/packet/packet_test.go b/net/packet/packet_test.go similarity index 100% rename from wgengine/packet/packet_test.go rename to net/packet/packet_test.go diff --git a/wgengine/packet/udp4.go b/net/packet/udp4.go similarity index 100% rename from wgengine/packet/udp4.go rename to net/packet/udp4.go diff --git a/wgengine/filter/filter.go b/wgengine/filter/filter.go index eac00e56f..8eeaeb328 100644 --- a/wgengine/filter/filter.go +++ b/wgengine/filter/filter.go @@ -13,9 +13,9 @@ import ( "github.com/golang/groupcache/lru" "golang.org/x/time/rate" + "tailscale.com/net/packet" "tailscale.com/tailcfg" "tailscale.com/types/logger" - "tailscale.com/wgengine/packet" ) type filterState struct { diff --git a/wgengine/filter/filter_test.go b/wgengine/filter/filter_test.go index 303ab9747..f197b0da5 100644 --- a/wgengine/filter/filter_test.go +++ b/wgengine/filter/filter_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" + "tailscale.com/net/packet" "tailscale.com/types/logger" - "tailscale.com/wgengine/packet" ) var Unknown = packet.Unknown diff --git a/wgengine/filter/match.go b/wgengine/filter/match.go index e2c170911..41e721652 100644 --- a/wgengine/filter/match.go +++ b/wgengine/filter/match.go @@ -10,7 +10,7 @@ import ( "net" "strings" - "tailscale.com/wgengine/packet" + "tailscale.com/net/packet" ) func NewIP(ip net.IP) packet.IP4 { diff --git a/wgengine/tstun/tun.go b/wgengine/tstun/tun.go index ebba40b75..2698b8815 100644 --- a/wgengine/tstun/tun.go +++ b/wgengine/tstun/tun.go @@ -16,9 +16,9 @@ import ( "github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/tun" + "tailscale.com/net/packet" "tailscale.com/types/logger" "tailscale.com/wgengine/filter" - "tailscale.com/wgengine/packet" ) const maxBufferSize = device.MaxMessageSize diff --git a/wgengine/tstun/tun_test.go b/wgengine/tstun/tun_test.go index 3d48e6286..d13d03aba 100644 --- a/wgengine/tstun/tun_test.go +++ b/wgengine/tstun/tun_test.go @@ -11,9 +11,9 @@ import ( "unsafe" "github.com/tailscale/wireguard-go/tun/tuntest" + "tailscale.com/net/packet" "tailscale.com/types/logger" "tailscale.com/wgengine/filter" - "tailscale.com/wgengine/packet" ) func udp(src, dst packet.IP4, sport, dport uint16) []byte { diff --git a/wgengine/userspace.go b/wgengine/userspace.go index 39eb9e641..46715f136 100644 --- a/wgengine/userspace.go +++ b/wgengine/userspace.go @@ -32,6 +32,7 @@ import ( "tailscale.com/internal/deepprint" "tailscale.com/ipn/ipnstate" "tailscale.com/net/interfaces" + "tailscale.com/net/packet" "tailscale.com/net/tsaddr" "tailscale.com/net/tshttpproxy" "tailscale.com/tailcfg" @@ -42,7 +43,6 @@ import ( "tailscale.com/wgengine/filter" "tailscale.com/wgengine/magicsock" "tailscale.com/wgengine/monitor" - "tailscale.com/wgengine/packet" "tailscale.com/wgengine/router" "tailscale.com/wgengine/tsdns" "tailscale.com/wgengine/tstun"