From cb3a67ffccfa1d3436bd9384c428242b6d8fc558 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 14 Dec 2021 22:17:23 +0100 Subject: global: update to go 1.18 beta1 Signed-off-by: Jason A. Donenfeld --- tunnel/addressconfig.go | 3 +-- tunnel/firewall/blocker.go | 3 +-- tunnel/firewall/rules.go | 3 +-- tunnel/pitfalls.go | 2 +- tunnel/winipcfg/luid.go | 3 +-- tunnel/winipcfg/netsh.go | 3 +-- tunnel/winipcfg/types.go | 3 +-- tunnel/winipcfg/winipcfg_test.go | 3 +-- 8 files changed, 8 insertions(+), 15 deletions(-) (limited to 'tunnel') 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" ) -- cgit v1.2.3-59-g8ed1b