diff --git a/client/tailscale/localclient.go b/client/tailscale/localclient.go index 076c597f8..04359960b 100644 --- a/client/tailscale/localclient.go +++ b/client/tailscale/localclient.go @@ -866,7 +866,6 @@ func (lc *LocalClient) NetworkLockForceLocalDisable(ctx context.Context) error { return nil } - // SetServeConfig sets or replaces the serving settings. // If config is nil, settings are cleared and serving is disabled. func (lc *LocalClient) SetServeConfig(ctx context.Context, config *ipn.ServeConfig) error { diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index af4b373f8..8a6263380 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -116,6 +116,17 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de github.com/tailscale/goupnp/soap from github.com/tailscale/goupnp+ github.com/tailscale/goupnp/ssdp from github.com/tailscale/goupnp L 💣 github.com/tailscale/netlink from tailscale.com/wgengine/router+ + 💣 github.com/tailscale/wireguard-go/conn from github.com/tailscale/wireguard-go/device+ + W 💣 github.com/tailscale/wireguard-go/conn/winrio from github.com/tailscale/wireguard-go/conn + 💣 github.com/tailscale/wireguard-go/device from tailscale.com/net/tstun+ + L github.com/tailscale/wireguard-go/endian from github.com/tailscale/wireguard-go/tun + 💣 github.com/tailscale/wireguard-go/ipc from github.com/tailscale/wireguard-go/device + W 💣 github.com/tailscale/wireguard-go/ipc/namedpipe from github.com/tailscale/wireguard-go/ipc + github.com/tailscale/wireguard-go/ratelimiter from github.com/tailscale/wireguard-go/device + github.com/tailscale/wireguard-go/replay from github.com/tailscale/wireguard-go/device + github.com/tailscale/wireguard-go/rwcancel from github.com/tailscale/wireguard-go/device+ + github.com/tailscale/wireguard-go/tai64n from github.com/tailscale/wireguard-go/device + 💣 github.com/tailscale/wireguard-go/tun from github.com/tailscale/wireguard-go/device+ github.com/tcnksm/go-httpstat from tailscale.com/net/netcheck LD github.com/u-root/u-root/pkg/termios from tailscale.com/ssh/tailssh L github.com/u-root/uio/rand from github.com/insomniacslk/dhcp/dhcpv4 @@ -126,19 +137,8 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de github.com/x448/float16 from github.com/fxamacker/cbor/v2 💣 go4.org/mem from tailscale.com/control/controlbase+ go4.org/netipx from tailscale.com/ipn/ipnlocal+ - W 💣 golang.zx2c4.com/wintun from golang.zx2c4.com/wireguard/tun+ - 💣 golang.zx2c4.com/wireguard/conn from golang.zx2c4.com/wireguard/device+ - W 💣 golang.zx2c4.com/wireguard/conn/winrio from golang.zx2c4.com/wireguard/conn - 💣 golang.zx2c4.com/wireguard/device from tailscale.com/net/tstun+ - L golang.zx2c4.com/wireguard/endian from golang.zx2c4.com/wireguard/tun - 💣 golang.zx2c4.com/wireguard/ipc from golang.zx2c4.com/wireguard/device - W 💣 golang.zx2c4.com/wireguard/ipc/namedpipe from golang.zx2c4.com/wireguard/ipc - golang.zx2c4.com/wireguard/ratelimiter from golang.zx2c4.com/wireguard/device - golang.zx2c4.com/wireguard/replay from golang.zx2c4.com/wireguard/device - golang.zx2c4.com/wireguard/rwcancel from golang.zx2c4.com/wireguard/device+ - golang.zx2c4.com/wireguard/tai64n from golang.zx2c4.com/wireguard/device - 💣 golang.zx2c4.com/wireguard/tun from golang.zx2c4.com/wireguard/device+ - W 💣 golang.zx2c4.com/wireguard/windows/tunnel/winipcfg from tailscale.com/cmd/tailscaled+ + W 💣 golang.zx2c4.com/wintun from github.com/tailscale/wireguard-go/tun+ + W 💣 golang.zx2c4.com/wireguard/windows/tunnel/winipcfg from tailscale.com/net/dns+ gvisor.dev/gvisor/pkg/atomicbitops from gvisor.dev/gvisor/pkg/tcpip+ gvisor.dev/gvisor/pkg/bits from gvisor.dev/gvisor/pkg/bufferv2 💣 gvisor.dev/gvisor/pkg/bufferv2 from gvisor.dev/gvisor/pkg/tcpip+ @@ -303,7 +303,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/util/strs from tailscale.com/hostinfo+ tailscale.com/util/systemd from tailscale.com/control/controlclient+ tailscale.com/util/uniq from tailscale.com/wgengine/magicsock+ - 💣 tailscale.com/util/winutil from tailscale.com/cmd/tailscaled+ + 💣 tailscale.com/util/winutil from tailscale.com/control/controlclient+ tailscale.com/version from tailscale.com/derp+ tailscale.com/version/distro from tailscale.com/hostinfo+ W tailscale.com/wf from tailscale.com/cmd/tailscaled @@ -322,7 +322,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de golang.org/x/crypto/acme from tailscale.com/ipn/ipnlocal golang.org/x/crypto/argon2 from tailscale.com/tka golang.org/x/crypto/blake2b from golang.org/x/crypto/nacl/box+ - golang.org/x/crypto/blake2s from golang.zx2c4.com/wireguard/device+ + golang.org/x/crypto/blake2s from github.com/tailscale/wireguard-go/device+ LD golang.org/x/crypto/blowfish from golang.org/x/crypto/ssh/internal/bcrypt_pbkdf+ golang.org/x/crypto/chacha20 from golang.org/x/crypto/chacha20poly1305+ golang.org/x/crypto/chacha20poly1305 from crypto/tls+ @@ -333,7 +333,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de golang.org/x/crypto/hkdf from crypto/tls+ golang.org/x/crypto/nacl/box from tailscale.com/types/key golang.org/x/crypto/nacl/secretbox from golang.org/x/crypto/nacl/box - golang.org/x/crypto/poly1305 from golang.zx2c4.com/wireguard/device+ + golang.org/x/crypto/poly1305 from github.com/tailscale/golang-x-crypto/ssh+ golang.org/x/crypto/salsa20/salsa from golang.org/x/crypto/nacl/box+ LD golang.org/x/crypto/ssh from tailscale.com/ssh/tailssh+ golang.org/x/exp/constraints from golang.org/x/exp/slices @@ -348,15 +348,15 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de golang.org/x/net/http2/hpack from golang.org/x/net/http2+ golang.org/x/net/icmp from tailscale.com/net/ping golang.org/x/net/idna from golang.org/x/net/http/httpguts+ - golang.org/x/net/ipv4 from golang.zx2c4.com/wireguard/device+ - golang.org/x/net/ipv6 from golang.zx2c4.com/wireguard/device+ + golang.org/x/net/ipv4 from github.com/tailscale/wireguard-go/conn+ + golang.org/x/net/ipv6 from github.com/tailscale/wireguard-go/conn+ golang.org/x/net/proxy from tailscale.com/net/netns D golang.org/x/net/route from net+ golang.org/x/sync/errgroup from github.com/mdlayher/socket+ golang.org/x/sys/cpu from golang.org/x/crypto/blake2b+ LD golang.org/x/sys/unix from github.com/insomniacslk/dhcp/interfaces+ W golang.org/x/sys/windows from github.com/go-ole/go-ole+ - W golang.org/x/sys/windows/registry from golang.org/x/sys/windows/svc/eventlog+ + W golang.org/x/sys/windows/registry from golang.zx2c4.com/wireguard/windows/tunnel/winipcfg+ W golang.org/x/sys/windows/svc from golang.org/x/sys/windows/svc/mgr+ W golang.org/x/sys/windows/svc/eventlog from tailscale.com/cmd/tailscaled W golang.org/x/sys/windows/svc/mgr from tailscale.com/cmd/tailscaled+ @@ -432,7 +432,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de net/http/httputil from github.com/aws/smithy-go/transport/http+ net/http/internal from net/http+ net/http/pprof from tailscale.com/cmd/tailscaled+ - net/netip from golang.zx2c4.com/wireguard/conn+ + net/netip from github.com/tailscale/wireguard-go/conn+ net/textproto from golang.org/x/net/http/httpguts+ net/url from crypto/x509+ os from crypto/rand+ diff --git a/cmd/tailscaled/tailscaled_windows.go b/cmd/tailscaled/tailscaled_windows.go index 63864852c..300e8083d 100644 --- a/cmd/tailscaled/tailscaled_windows.go +++ b/cmd/tailscaled/tailscaled_windows.go @@ -35,11 +35,11 @@ import ( "time" "github.com/dblohm7/wingoes/com" + "github.com/tailscale/wireguard-go/tun" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/eventlog" "golang.zx2c4.com/wintun" - "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "tailscale.com/envknob" "tailscale.com/logpolicy" diff --git a/go.mod b/go.mod index 53aef54b8..baae837ef 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module tailscale.com go 1.19 -replace golang.zx2c4.com/wireguard => github.com/tailscale/wireguard-go v0.0.0-20221207223341-6be4ed075788 - require ( filippo.io/mkcert v1.4.3 github.com/Microsoft/go-winio v0.6.0 @@ -59,6 +57,7 @@ require ( github.com/tailscale/hujson v0.0.0-20220630195928-54599719472f github.com/tailscale/mkctr v0.0.0-20220601142259-c0b937af2e89 github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 + github.com/tailscale/wireguard-go v0.0.0-20221209221345-680a09da0b2e github.com/tc-hib/winres v0.1.6 github.com/tcnksm/go-httpstat v0.2.0 github.com/toqueteos/webbrowser v1.2.0 @@ -75,7 +74,6 @@ require ( golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 golang.org/x/tools v0.2.0 golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 - golang.zx2c4.com/wireguard v0.0.0-20220920152132-bb719d3a6e2c golang.zx2c4.com/wireguard/windows v0.5.3 gvisor.dev/gvisor v0.0.0-20220817001344-846276b3dbc5 honnef.co/go/tools v0.4.0-0.dev.0.20220517111757-f4a2f64ce238 diff --git a/go.sum b/go.sum index 07809f541..7b1005d45 100644 --- a/go.sum +++ b/go.sum @@ -1108,8 +1108,8 @@ github.com/tailscale/mkctr v0.0.0-20220601142259-c0b937af2e89 h1:7xU7AFQE83h0wz/ github.com/tailscale/mkctr v0.0.0-20220601142259-c0b937af2e89/go.mod h1:OGMqrTzDqmJkGumUTtOv44Rp3/4xS+QFbE8Rn0AGlaU= github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 h1:zrsUcqrG2uQSPhaUPjUQwozcRdDdSxxqhNgNZ3drZFk= github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85/go.mod h1:NzVQi3Mleb+qzq8VmcWpSkcSYxXIg0DkI6XDzpVkhJ0= -github.com/tailscale/wireguard-go v0.0.0-20221207223341-6be4ed075788 h1:HRBKNhAqG+3NGtudGB8QzpaKlvf4MoBCMEnjdF+D+nA= -github.com/tailscale/wireguard-go v0.0.0-20221207223341-6be4ed075788/go.mod h1:wzWjYPfptTrgXwkAZmjd7sXHf7RYnz5PrPr6GN1eb2Y= +github.com/tailscale/wireguard-go v0.0.0-20221209221345-680a09da0b2e h1:A7WGeTOZtS3kKms9sQA9TXlJK5NSji4+jNu3N/e/YDI= +github.com/tailscale/wireguard-go v0.0.0-20221209221345-680a09da0b2e/go.mod h1:iiClgxBTruKI+nmzlQxbFw6c3nB/wb4Td/WCyX2berY= github.com/tc-hib/winres v0.1.6 h1:qgsYHze+BxQPEYilxIz/KCQGaClvI2+yLBAZs+3+0B8= github.com/tc-hib/winres v0.1.6/go.mod h1:pe6dOR40VOrGz8PkzreVKNvEKnlE8t4yR8A8naL+t7A= github.com/tcnksm/go-httpstat v0.2.0 h1:rP7T5e5U2HfmOBmZzGgGZjBQ5/GluWUylujl0tJ04I0= diff --git a/net/dnscache/dnscache.go b/net/dnscache/dnscache.go index 9a78380aa..dc117928f 100644 --- a/net/dnscache/dnscache.go +++ b/net/dnscache/dnscache.go @@ -276,7 +276,7 @@ func (r *Resolver) lookupIP(host string) (ip, ip6 netip.Addr, allIPs []netip.Add return netip.Addr{}, netip.Addr{}, nil, fmt.Errorf("no IPs for %q found", host) } - // Unmap everything; LookupNetIP can return mapped addresses (see #5698) + // Unmap everything; LookupNetIP can return mapped addresses (see #5698) for i := range ips { ips[i] = ips[i].Unmap() } diff --git a/net/interfaces/interfaces_bsd.go b/net/interfaces/interfaces_bsd.go index 6db9458ea..31f7e0d64 100644 --- a/net/interfaces/interfaces_bsd.go +++ b/net/interfaces/interfaces_bsd.go @@ -84,7 +84,7 @@ func DefaultRouteInterfaceIndex() (int, error) { var defaultRouteInterfaceIndexFunc syncs.AtomicValue[func() int] -// SetDefaultRouteInterfaceIndexFunc allows an alternate implementation of +// SetDefaultRouteInterfaceIndexFunc allows an alternate implementation of // DefaultRouteInterfaceIndex to be provided. If none is set, or if f() returns a 0 // (indicating an unknown interface index), then the default implementation (that parses // the routing table) will be used. diff --git a/net/tstun/fake.go b/net/tstun/fake.go index 75ff7a384..e113064c6 100644 --- a/net/tstun/fake.go +++ b/net/tstun/fake.go @@ -8,7 +8,7 @@ import ( "io" "os" - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" ) type fakeTUN struct { diff --git a/net/tstun/ifstatus_noop.go b/net/tstun/ifstatus_noop.go index bd1e7bf15..30840e11a 100644 --- a/net/tstun/ifstatus_noop.go +++ b/net/tstun/ifstatus_noop.go @@ -9,7 +9,7 @@ package tstun import ( "time" - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" "tailscale.com/types/logger" ) diff --git a/net/tstun/ifstatus_windows.go b/net/tstun/ifstatus_windows.go index 7bbbfba5e..dc0e4a24d 100644 --- a/net/tstun/ifstatus_windows.go +++ b/net/tstun/ifstatus_windows.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "tailscale.com/types/logger" ) diff --git a/net/tstun/linkattrs_linux.go b/net/tstun/linkattrs_linux.go index 57aa406c4..434c9815b 100644 --- a/net/tstun/linkattrs_linux.go +++ b/net/tstun/linkattrs_linux.go @@ -7,8 +7,8 @@ package tstun import ( "github.com/mdlayher/genetlink" "github.com/mdlayher/netlink" + "github.com/tailscale/wireguard-go/tun" "golang.org/x/sys/unix" - "golang.zx2c4.com/wireguard/tun" ) // setLinkSpeed sets the advertised link speed of the TUN interface. diff --git a/net/tstun/linkattrs_notlinux.go b/net/tstun/linkattrs_notlinux.go index 716b85c73..c01befdf2 100644 --- a/net/tstun/linkattrs_notlinux.go +++ b/net/tstun/linkattrs_notlinux.go @@ -6,7 +6,7 @@ package tstun -import "golang.zx2c4.com/wireguard/tun" +import "github.com/tailscale/wireguard-go/tun" func setLinkAttrs(iface tun.Device) error { return nil diff --git a/net/tstun/tap_linux.go b/net/tstun/tap_linux.go index caf7b6573..b36f9abf4 100644 --- a/net/tstun/tap_linux.go +++ b/net/tstun/tap_linux.go @@ -15,8 +15,8 @@ import ( "sync" "github.com/insomniacslk/dhcp/dhcpv4" + "github.com/tailscale/wireguard-go/tun" "golang.org/x/sys/unix" - "golang.zx2c4.com/wireguard/tun" "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/header" "gvisor.dev/gvisor/pkg/tcpip/network/ipv4" diff --git a/net/tstun/tun.go b/net/tstun/tun.go index ce766acb6..90a865f81 100644 --- a/net/tstun/tun.go +++ b/net/tstun/tun.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" "tailscale.com/envknob" "tailscale.com/types/logger" ) diff --git a/net/tstun/tun_notwindows.go b/net/tstun/tun_notwindows.go index 73eb8fdaa..934f50bf7 100644 --- a/net/tstun/tun_notwindows.go +++ b/net/tstun/tun_notwindows.go @@ -6,7 +6,7 @@ package tstun -import "golang.zx2c4.com/wireguard/tun" +import "github.com/tailscale/wireguard-go/tun" func interfaceName(dev tun.Device) (string, error) { return dev.Name() diff --git a/net/tstun/tun_windows.go b/net/tstun/tun_windows.go index a05c9b130..eb30e63d1 100644 --- a/net/tstun/tun_windows.go +++ b/net/tstun/tun_windows.go @@ -5,8 +5,8 @@ package tstun import ( + "github.com/tailscale/wireguard-go/tun" "golang.org/x/sys/windows" - "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" ) diff --git a/net/tstun/wrap.go b/net/tstun/wrap.go index b6e36a988..b7a7668fb 100644 --- a/net/tstun/wrap.go +++ b/net/tstun/wrap.go @@ -17,9 +17,9 @@ import ( "sync/atomic" "time" + "github.com/tailscale/wireguard-go/device" + "github.com/tailscale/wireguard-go/tun" "go4.org/mem" - "golang.zx2c4.com/wireguard/device" - "golang.zx2c4.com/wireguard/tun" "gvisor.dev/gvisor/pkg/tcpip/stack" "tailscale.com/disco" "tailscale.com/net/connstats" diff --git a/net/tstun/wrap_test.go b/net/tstun/wrap_test.go index 12d397ff2..54b6f3bba 100644 --- a/net/tstun/wrap_test.go +++ b/net/tstun/wrap_test.go @@ -15,9 +15,9 @@ import ( "testing" "unsafe" + "github.com/tailscale/wireguard-go/tun/tuntest" "go4.org/mem" "go4.org/netipx" - "golang.zx2c4.com/wireguard/tun/tuntest" "tailscale.com/disco" "tailscale.com/net/connstats" "tailscale.com/net/netaddr" diff --git a/tsnet/example/tsnet-http-client/tsnet-http-client.go b/tsnet/example/tsnet-http-client/tsnet-http-client.go index d707f73db..1d72ee17c 100644 --- a/tsnet/example/tsnet-http-client/tsnet-http-client.go +++ b/tsnet/example/tsnet-http-client/tsnet-http-client.go @@ -26,7 +26,7 @@ func main() { flag.Usage() } tailnetURL := flag.Arg(0) - + s := new(tsnet.Server) defer s.Close() diff --git a/tsnet/tsnet.go b/tsnet/tsnet.go index c06555bd7..ad7a28a1a 100644 --- a/tsnet/tsnet.go +++ b/tsnet/tsnet.go @@ -121,8 +121,8 @@ func (s *Server) Dial(ctx context.Context, network, address string) (net.Conn, e // This is useful if you need to have your tsnet services connect to other devices on // your tailnet. func (s *Server) HTTPClient() *http.Client { - return &http.Client { - Transport: &http.Transport { + return &http.Client{ + Transport: &http.Transport{ DialContext: s.Dial, }, } diff --git a/tstest/integration/tailscaled_deps_test_windows.go b/tstest/integration/tailscaled_deps_test_windows.go index 57159b95a..8c1b8c35b 100644 --- a/tstest/integration/tailscaled_deps_test_windows.go +++ b/tstest/integration/tailscaled_deps_test_windows.go @@ -12,12 +12,12 @@ import ( // transitive deps when we run "go install tailscaled" in a child // process and can cache a prior success when a dependency changes. _ "github.com/dblohm7/wingoes/com" + _ "github.com/tailscale/wireguard-go/tun" _ "golang.org/x/sys/windows" _ "golang.org/x/sys/windows/svc" _ "golang.org/x/sys/windows/svc/eventlog" _ "golang.org/x/sys/windows/svc/mgr" _ "golang.zx2c4.com/wintun" - _ "golang.zx2c4.com/wireguard/tun" _ "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" _ "tailscale.com/cmd/tailscaled/childproc" _ "tailscale.com/control/controlclient" diff --git a/tstest/iosdeps/iosdeps.go b/tstest/iosdeps/iosdeps.go index 5d51ed771..b4593062d 100644 --- a/tstest/iosdeps/iosdeps.go +++ b/tstest/iosdeps/iosdeps.go @@ -35,10 +35,10 @@ import ( _ "time" _ "unsafe" + _ "github.com/tailscale/wireguard-go/device" + _ "github.com/tailscale/wireguard-go/tun" _ "go4.org/mem" _ "golang.org/x/sys/unix" - _ "golang.zx2c4.com/wireguard/device" - _ "golang.zx2c4.com/wireguard/tun" _ "tailscale.com/hostinfo" _ "tailscale.com/ipn" _ "tailscale.com/ipn/ipnlocal" diff --git a/types/tkatype/tkatype_test.go b/types/tkatype/tkatype_test.go index 78a9865d4..04214901b 100644 --- a/types/tkatype/tkatype_test.go +++ b/types/tkatype/tkatype_test.go @@ -5,8 +5,9 @@ package tkatype import ( - "golang.org/x/crypto/blake2s" "testing" + + "golang.org/x/crypto/blake2s" ) func TestSigHashSize(t *testing.T) { diff --git a/wgengine/bench/wg.go b/wgengine/bench/wg.go index f6a215896..eb76a479a 100644 --- a/wgengine/bench/wg.go +++ b/wgengine/bench/wg.go @@ -13,7 +13,7 @@ import ( "sync" "testing" - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" "tailscale.com/net/dns" "tailscale.com/tailcfg" diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index e5b782c9d..bb1d96c92 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -28,10 +28,10 @@ import ( "sync/atomic" "time" + "github.com/tailscale/wireguard-go/conn" "go4.org/mem" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "golang.zx2c4.com/wireguard/conn" "tailscale.com/control/controlclient" "tailscale.com/derp" "tailscale.com/derp/derphttp" diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go index 7e8f623c8..2dc9c1513 100644 --- a/wgengine/magicsock/magicsock_test.go +++ b/wgengine/magicsock/magicsock_test.go @@ -27,11 +27,11 @@ import ( "time" "unsafe" + wgconn "github.com/tailscale/wireguard-go/conn" + "github.com/tailscale/wireguard-go/device" + "github.com/tailscale/wireguard-go/tun/tuntest" "go4.org/mem" "golang.org/x/exp/maps" - wgconn "golang.zx2c4.com/wireguard/conn" - "golang.zx2c4.com/wireguard/device" - "golang.zx2c4.com/wireguard/tun/tuntest" "tailscale.com/derp" "tailscale.com/derp/derphttp" "tailscale.com/disco" diff --git a/wgengine/mem_ios.go b/wgengine/mem_ios.go index f91586edb..ba370104b 100644 --- a/wgengine/mem_ios.go +++ b/wgengine/mem_ios.go @@ -5,7 +5,7 @@ package wgengine import ( - "golang.zx2c4.com/wireguard/device" + "github.com/tailscale/wireguard-go/device" ) // iOS has a very restrictive memory limit on network extensions. diff --git a/wgengine/router/ifconfig_windows.go b/wgengine/router/ifconfig_windows.go index 337815d91..c1c71a975 100644 --- a/wgengine/router/ifconfig_windows.go +++ b/wgengine/router/ifconfig_windows.go @@ -15,10 +15,10 @@ import ( "time" ole "github.com/go-ole/go-ole" + "github.com/tailscale/wireguard-go/tun" "go4.org/netipx" "golang.org/x/exp/slices" "golang.org/x/sys/windows" - "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "tailscale.com/health" "tailscale.com/net/interfaces" diff --git a/wgengine/router/router.go b/wgengine/router/router.go index 84933a18f..48b54a3fa 100644 --- a/wgengine/router/router.go +++ b/wgengine/router/router.go @@ -10,7 +10,7 @@ import ( "net/netip" "reflect" - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" "tailscale.com/types/logger" "tailscale.com/types/preftype" "tailscale.com/wgengine/monitor" diff --git a/wgengine/router/router_darwin.go b/wgengine/router/router_darwin.go index 931c4d7bd..02992def8 100644 --- a/wgengine/router/router_darwin.go +++ b/wgengine/router/router_darwin.go @@ -5,7 +5,7 @@ package router import ( - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" "tailscale.com/types/logger" "tailscale.com/wgengine/monitor" ) diff --git a/wgengine/router/router_default.go b/wgengine/router/router_default.go index 99b31084f..0e717e551 100644 --- a/wgengine/router/router_default.go +++ b/wgengine/router/router_default.go @@ -10,7 +10,7 @@ import ( "fmt" "runtime" - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" "tailscale.com/types/logger" "tailscale.com/wgengine/monitor" ) diff --git a/wgengine/router/router_freebsd.go b/wgengine/router/router_freebsd.go index 70174c94d..8a87603ef 100644 --- a/wgengine/router/router_freebsd.go +++ b/wgengine/router/router_freebsd.go @@ -5,7 +5,7 @@ package router import ( - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" "tailscale.com/types/logger" "tailscale.com/wgengine/monitor" ) diff --git a/wgengine/router/router_linux.go b/wgengine/router/router_linux.go index 7e64e6158..e65129c47 100644 --- a/wgengine/router/router_linux.go +++ b/wgengine/router/router_linux.go @@ -19,10 +19,10 @@ import ( "github.com/coreos/go-iptables/iptables" "github.com/tailscale/netlink" + "github.com/tailscale/wireguard-go/tun" "go4.org/netipx" "golang.org/x/sys/unix" "golang.org/x/time/rate" - "golang.zx2c4.com/wireguard/tun" "tailscale.com/envknob" "tailscale.com/net/tsaddr" "tailscale.com/types/logger" diff --git a/wgengine/router/router_linux_test.go b/wgengine/router/router_linux_test.go index b7c1a20c4..0b6d0836e 100644 --- a/wgengine/router/router_linux_test.go +++ b/wgengine/router/router_linux_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/tailscale/wireguard-go/tun" "github.com/vishvananda/netlink" "golang.org/x/exp/slices" - "golang.zx2c4.com/wireguard/tun" "tailscale.com/tstest" "tailscale.com/types/logger" "tailscale.com/wgengine/monitor" diff --git a/wgengine/router/router_openbsd.go b/wgengine/router/router_openbsd.go index 859b4be34..2f3ec379a 100644 --- a/wgengine/router/router_openbsd.go +++ b/wgengine/router/router_openbsd.go @@ -11,8 +11,8 @@ import ( "net/netip" "os/exec" + "github.com/tailscale/wireguard-go/tun" "go4.org/netipx" - "golang.zx2c4.com/wireguard/tun" "tailscale.com/types/logger" "tailscale.com/wgengine/monitor" ) diff --git a/wgengine/router/router_userspace_bsd.go b/wgengine/router/router_userspace_bsd.go index 34a970fc1..f13d0d682 100644 --- a/wgengine/router/router_userspace_bsd.go +++ b/wgengine/router/router_userspace_bsd.go @@ -13,8 +13,8 @@ import ( "os/exec" "runtime" + "github.com/tailscale/wireguard-go/tun" "go4.org/netipx" - "golang.zx2c4.com/wireguard/tun" "tailscale.com/net/tsaddr" "tailscale.com/types/logger" "tailscale.com/version" diff --git a/wgengine/router/router_windows.go b/wgengine/router/router_windows.go index ba024b1ff..8c84d52d5 100644 --- a/wgengine/router/router_windows.go +++ b/wgengine/router/router_windows.go @@ -18,8 +18,8 @@ import ( "syscall" "time" + "github.com/tailscale/wireguard-go/tun" "golang.org/x/sys/windows" - "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "tailscale.com/logtail/backoff" "tailscale.com/net/dns" diff --git a/wgengine/userspace.go b/wgengine/userspace.go index 320fc9245..f75efbed3 100644 --- a/wgengine/userspace.go +++ b/wgengine/userspace.go @@ -19,9 +19,9 @@ import ( "sync" "time" + "github.com/tailscale/wireguard-go/device" + "github.com/tailscale/wireguard-go/tun" "golang.org/x/exp/maps" - "golang.zx2c4.com/wireguard/device" - "golang.zx2c4.com/wireguard/tun" "tailscale.com/control/controlclient" "tailscale.com/envknob" "tailscale.com/health" diff --git a/wgengine/userspace_ext_test.go b/wgengine/userspace_ext_test.go index 11c52e67b..94d97e1f6 100644 --- a/wgengine/userspace_ext_test.go +++ b/wgengine/userspace_ext_test.go @@ -7,7 +7,7 @@ package wgengine_test import ( "testing" - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/tun" "tailscale.com/net/tstun" "tailscale.com/types/logger" "tailscale.com/wgengine" diff --git a/wgengine/wgcfg/device.go b/wgengine/wgcfg/device.go index 744d24cc6..31cc06ce3 100644 --- a/wgengine/wgcfg/device.go +++ b/wgengine/wgcfg/device.go @@ -8,9 +8,9 @@ import ( "io" "sort" - "golang.zx2c4.com/wireguard/conn" - "golang.zx2c4.com/wireguard/device" - "golang.zx2c4.com/wireguard/tun" + "github.com/tailscale/wireguard-go/conn" + "github.com/tailscale/wireguard-go/device" + "github.com/tailscale/wireguard-go/tun" "tailscale.com/types/logger" "tailscale.com/util/multierr" ) diff --git a/wgengine/wgcfg/device_test.go b/wgengine/wgcfg/device_test.go index c68c0d01d..bc05f9fef 100644 --- a/wgengine/wgcfg/device_test.go +++ b/wgengine/wgcfg/device_test.go @@ -15,10 +15,10 @@ import ( "sync" "testing" + "github.com/tailscale/wireguard-go/conn" + "github.com/tailscale/wireguard-go/device" + "github.com/tailscale/wireguard-go/tun" "go4.org/mem" - "golang.zx2c4.com/wireguard/conn" - "golang.zx2c4.com/wireguard/device" - "golang.zx2c4.com/wireguard/tun" "tailscale.com/types/key" ) diff --git a/wgengine/wgint/wgint.go b/wgengine/wgint/wgint.go index 5af6bb7eb..4927fa899 100644 --- a/wgengine/wgint/wgint.go +++ b/wgengine/wgint/wgint.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "unsafe" - "golang.zx2c4.com/wireguard/device" + "github.com/tailscale/wireguard-go/device" ) var ( diff --git a/wgengine/wgint/wgint_test.go b/wgengine/wgint/wgint_test.go index bfa0770a5..8852e9509 100644 --- a/wgengine/wgint/wgint_test.go +++ b/wgengine/wgint/wgint_test.go @@ -7,7 +7,7 @@ package wgint import ( "testing" - "golang.zx2c4.com/wireguard/device" + "github.com/tailscale/wireguard-go/device" ) func TestPeerStats(t *testing.T) { diff --git a/wgengine/wglog/wglog.go b/wgengine/wglog/wglog.go index 779d1df15..2d28ecc2a 100644 --- a/wgengine/wglog/wglog.go +++ b/wgengine/wglog/wglog.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "golang.zx2c4.com/wireguard/device" + "github.com/tailscale/wireguard-go/device" "tailscale.com/syncs" "tailscale.com/types/key" "tailscale.com/types/logger"