aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tunnel
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2021-12-14 22:17:23 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2021-12-16 03:14:14 +0100
commitcb3a67ffccfa1d3436bd9384c428242b6d8fc558 (patch)
tree0cb6d1c0ca005ee136ed314e6b9233f33bd7ec8f /tunnel
parentbuild: remove patcher (diff)
downloadwireguard-windows-cb3a67ffccfa1d3436bd9384c428242b6d8fc558.tar.xz
wireguard-windows-cb3a67ffccfa1d3436bd9384c428242b6d8fc558.zip
global: update to go 1.18 beta1
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'tunnel')
-rw-r--r--tunnel/addressconfig.go3
-rw-r--r--tunnel/firewall/blocker.go3
-rw-r--r--tunnel/firewall/rules.go3
-rw-r--r--tunnel/pitfalls.go2
-rw-r--r--tunnel/winipcfg/luid.go3
-rw-r--r--tunnel/winipcfg/netsh.go3
-rw-r--r--tunnel/winipcfg/types.go3
-rw-r--r--tunnel/winipcfg/winipcfg_test.go3
8 files changed, 8 insertions, 15 deletions
diff --git a/tunnel/addressconfig.go b/tunnel/addressconfig.go
index 8be13fb9..1ab10965 100644
--- a/tunnel/addressconfig.go
+++ b/tunnel/addressconfig.go
@@ -8,10 +8,9 @@ package tunnel
import (
"fmt"
"log"
+ "net/netip"
"time"
- "golang.zx2c4.com/go118/netip"
-
"golang.org/x/sys/windows"
"golang.zx2c4.com/wireguard/windows/conf"
"golang.zx2c4.com/wireguard/windows/services"
diff --git a/tunnel/firewall/blocker.go b/tunnel/firewall/blocker.go
index 4be62aa9..96fd7f1b 100644
--- a/tunnel/firewall/blocker.go
+++ b/tunnel/firewall/blocker.go
@@ -7,10 +7,9 @@ package firewall
import (
"errors"
+ "net/netip"
"unsafe"
- "golang.zx2c4.com/go118/netip"
-
"golang.org/x/sys/windows"
)
diff --git a/tunnel/firewall/rules.go b/tunnel/firewall/rules.go
index c5a0c4e6..1aff9343 100644
--- a/tunnel/firewall/rules.go
+++ b/tunnel/firewall/rules.go
@@ -8,11 +8,10 @@ package firewall
import (
"encoding/binary"
"errors"
+ "net/netip"
"runtime"
"unsafe"
- "golang.zx2c4.com/go118/netip"
-
"golang.org/x/sys/windows"
)
diff --git a/tunnel/pitfalls.go b/tunnel/pitfalls.go
index 6ac0f725..0238dc5b 100644
--- a/tunnel/pitfalls.go
+++ b/tunnel/pitfalls.go
@@ -7,12 +7,12 @@ package tunnel
import (
"log"
+ "net/netip"
"strings"
"unsafe"
"golang.org/x/sys/windows"
"golang.org/x/sys/windows/svc/mgr"
- "golang.zx2c4.com/go118/netip"
"golang.zx2c4.com/wireguard/windows/conf"
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
)
diff --git a/tunnel/winipcfg/luid.go b/tunnel/winipcfg/luid.go
index 744fee62..c794c86f 100644
--- a/tunnel/winipcfg/luid.go
+++ b/tunnel/winipcfg/luid.go
@@ -7,10 +7,9 @@ package winipcfg
import (
"errors"
+ "net/netip"
"strings"
- "golang.zx2c4.com/go118/netip"
-
"golang.org/x/sys/windows"
)
diff --git a/tunnel/winipcfg/netsh.go b/tunnel/winipcfg/netsh.go
index 17e0778c..9c4622b2 100644
--- a/tunnel/winipcfg/netsh.go
+++ b/tunnel/winipcfg/netsh.go
@@ -10,13 +10,12 @@ import (
"errors"
"fmt"
"io"
+ "net/netip"
"os/exec"
"path/filepath"
"strings"
"syscall"
- "golang.zx2c4.com/go118/netip"
-
"golang.org/x/sys/windows"
"golang.org/x/sys/windows/registry"
)
diff --git a/tunnel/winipcfg/types.go b/tunnel/winipcfg/types.go
index 04510bea..96754da6 100644
--- a/tunnel/winipcfg/types.go
+++ b/tunnel/winipcfg/types.go
@@ -8,11 +8,10 @@ package winipcfg
import (
"encoding/binary"
"fmt"
+ "net/netip"
"strconv"
"unsafe"
- "golang.zx2c4.com/go118/netip"
-
"golang.org/x/sys/windows"
)
diff --git a/tunnel/winipcfg/winipcfg_test.go b/tunnel/winipcfg/winipcfg_test.go
index d863b1a2..4424d1dd 100644
--- a/tunnel/winipcfg/winipcfg_test.go
+++ b/tunnel/winipcfg/winipcfg_test.go
@@ -22,13 +22,12 @@ Some tests in this file require:
package winipcfg
import (
+ "net/netip"
"strings"
"syscall"
"testing"
"time"
- "golang.zx2c4.com/go118/netip"
-
"golang.org/x/sys/windows"
)