go.mod: upgrade wireguard-windows, de-fork wireguard-go

Pull in the latest version of wireguard-windows.

Switch to upstream wireguard-go.
This requires reverting all of our import paths.

Unfortunately, this has to happen at the same time.
The wireguard-go change is very low risk,
as that commit matches our fork almost exactly.
(The only changes are import paths, CI files, and a go.mod entry.)
So if there are issues as a result of this commit,
the first place to look is wireguard-windows changes.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder
2021-05-25 12:42:22 -07:00
committed by Josh Bleecher Snyder
parent ceaaa23962
commit 1ece91cede
31 changed files with 77 additions and 55 deletions

View File

@@ -12,7 +12,7 @@ import (
"sync"
"testing"
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"inet.af/netaddr"
"tailscale.com/net/dns"

View File

@@ -16,11 +16,11 @@ import (
"sync"
"time"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/tai64n"
"golang.org/x/crypto/blake2s"
"golang.org/x/crypto/chacha20poly1305"
"golang.org/x/crypto/poly1305"
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/tai64n"
"inet.af/netaddr"
"tailscale.com/ipn/ipnstate"
"tailscale.com/types/key"

View File

@@ -27,9 +27,9 @@ import (
"sync/atomic"
"time"
"github.com/tailscale/wireguard-go/conn"
"golang.org/x/crypto/nacl/box"
"golang.org/x/time/rate"
"golang.zx2c4.com/wireguard/conn"
"inet.af/netaddr"
"tailscale.com/control/controlclient"
"tailscale.com/derp"

View File

@@ -26,9 +26,9 @@ import (
"time"
"unsafe"
"github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun/tuntest"
"golang.org/x/crypto/nacl/box"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun/tuntest"
"inet.af/netaddr"
"tailscale.com/derp"
"tailscale.com/derp/derphttp"

View File

@@ -5,7 +5,7 @@
package wgengine
import (
"github.com/tailscale/wireguard-go/device"
"golang.zx2c4.com/wireguard/device"
)
// iOS has a very restrictive memory limit on network extensions.

View File

@@ -17,8 +17,8 @@ import (
"github.com/go-multierror/multierror"
ole "github.com/go-ole/go-ole"
"github.com/tailscale/wireguard-go/tun"
"golang.org/x/sys/windows"
"golang.zx2c4.com/wireguard/tun"
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
"inet.af/netaddr"
"tailscale.com/health"

View File

@@ -7,7 +7,7 @@
package router
import (
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"inet.af/netaddr"
"tailscale.com/types/logger"
"tailscale.com/types/preftype"

View File

@@ -5,7 +5,7 @@
package router
import (
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"tailscale.com/types/logger"
)

View File

@@ -7,7 +7,7 @@
package router
import (
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"tailscale.com/types/logger"
)

View File

@@ -5,7 +5,7 @@
package router
import (
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"tailscale.com/types/logger"
)

View File

@@ -16,7 +16,7 @@ import (
"github.com/coreos/go-iptables/iptables"
"github.com/go-multierror/multierror"
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"inet.af/netaddr"
"tailscale.com/net/tsaddr"
"tailscale.com/types/logger"

View File

@@ -16,7 +16,7 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"inet.af/netaddr"
)

View File

@@ -10,7 +10,7 @@ import (
"log"
"os/exec"
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"inet.af/netaddr"
"tailscale.com/types/logger"
)

View File

@@ -12,7 +12,7 @@ import (
"os/exec"
"runtime"
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"inet.af/netaddr"
"tailscale.com/net/tsaddr"
"tailscale.com/types/logger"

View File

@@ -16,8 +16,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"
"inet.af/netaddr"
"tailscale.com/logtail/backoff"

View File

@@ -20,9 +20,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"
"inet.af/netaddr"
"tailscale.com/control/controlclient"
"tailscale.com/health"

View File

@@ -7,7 +7,7 @@ package wgengine_test
import (
"testing"
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
"tailscale.com/net/tstun"
"tailscale.com/types/logger"
"tailscale.com/wgengine"

View File

@@ -8,7 +8,7 @@ import (
"io"
"sort"
"github.com/tailscale/wireguard-go/device"
"golang.zx2c4.com/wireguard/device"
"tailscale.com/types/logger"
)

View File

@@ -16,9 +16,9 @@ import (
"sync"
"testing"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun"
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun"
"inet.af/netaddr"
"tailscale.com/types/wgkey"
)

View File

@@ -12,7 +12,7 @@ import (
"sync"
"sync/atomic"
"github.com/tailscale/wireguard-go/device"
"golang.zx2c4.com/wireguard/device"
"tailscale.com/types/logger"
"tailscale.com/types/wgkey"
"tailscale.com/wgengine/wgcfg"