stun, netcheck: move under net

cmd/derper/derper.go

@@ -29,7 +29,7 @@ import (
 	"tailscale.com/derp/derphttp"
 	"tailscale.com/logpolicy"
 	"tailscale.com/metrics"
-	"tailscale.com/stun"
+	"tailscale.com/net/stun"
 	"tailscale.com/tsweb"
 	"tailscale.com/types/key"
 )

cmd/tailscale/netcheck.go

@@ -14,7 +14,7 @@ import (
 	"github.com/peterbourgon/ff/v2/ffcli"
 	"tailscale.com/derp/derpmap"
 	"tailscale.com/net/dnscache"
-	"tailscale.com/netcheck"
+	"tailscale.com/net/netcheck"
 	"tailscale.com/types/logger"
 )
 

net/netcheck/netcheck.go

@@ -23,7 +23,7 @@ import (
 	"inet.af/netaddr"
 	"tailscale.com/net/dnscache"
 	"tailscale.com/net/interfaces"
-	"tailscale.com/stun"
+	"tailscale.com/net/stun"
 	"tailscale.com/syncs"
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/logger"

net/netcheck/netcheck_test.go

@@ -15,8 +15,8 @@ import (
 	"testing"
 	"time"
 
-	"tailscale.com/stun"
+	"tailscale.com/net/stun"
-	"tailscale.com/stun/stuntest"
+	"tailscale.com/net/stun/stuntest"
 	"tailscale.com/tailcfg"
 )
 

net/stun/stun_test.go

@@ -10,7 +10,7 @@ import (
 	"net"
 	"testing"
 
-	"tailscale.com/stun"
+	"tailscale.com/net/stun"
 )
 
 // TODO(bradfitz): fuzz this.

net/stun/stuntest/stuntest.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 
 	"inet.af/netaddr"
-	"tailscale.com/stun"
+	"tailscale.com/net/stun"
 	"tailscale.com/tailcfg"
 )
 

wgengine/magicsock/magicsock.go

@@ -35,8 +35,8 @@ import (
 	"tailscale.com/ipn/ipnstate"
 	"tailscale.com/net/dnscache"
 	"tailscale.com/net/interfaces"
-	"tailscale.com/netcheck"
+	"tailscale.com/net/netcheck"
-	"tailscale.com/stun"
+	"tailscale.com/net/stun"
 	"tailscale.com/syncs"
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/key"

wgengine/magicsock/magicsock_test.go

@@ -26,7 +26,7 @@ import (
 	"tailscale.com/derp"
 	"tailscale.com/derp/derphttp"
 	"tailscale.com/derp/derpmap"
-	"tailscale.com/stun/stuntest"
+	"tailscale.com/net/stun/stuntest"
 	"tailscale.com/tailcfg"
 	"tailscale.com/tstest"
 	"tailscale.com/types/key"