diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-11-05 01:52:54 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-11-06 14:32:05 +0100 |
commit | b51df1025175ef4b81dd1ecbb9d7ed389b8d1297 (patch) | |
tree | 8c33db634b1745c7b59b75a2af7f9af007d837e9 /device | |
parent | 23d4e52ac97fc7e4e7c47d4e277693c516c3b420 (diff) | |
download | wireguard-go-jd/netip-go118.tar.gz wireguard-go-jd/netip-go118.zip |
global: use Go 1.18's netip helpersjd/netip-go118
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'device')
-rw-r--r-- | device/allowedips.go | 3 | ||||
-rw-r--r-- | device/allowedips_rand_test.go | 3 | ||||
-rw-r--r-- | device/allowedips_test.go | 3 | ||||
-rw-r--r-- | device/device_test.go | 2 | ||||
-rw-r--r-- | device/endpoint_test.go | 3 | ||||
-rw-r--r-- | device/receive.go | 1 | ||||
-rw-r--r-- | device/send.go | 1 | ||||
-rw-r--r-- | device/uapi.go | 2 |
8 files changed, 8 insertions, 10 deletions
diff --git a/device/allowedips.go b/device/allowedips.go index a6534b1..95dde63 100644 --- a/device/allowedips.go +++ b/device/allowedips.go @@ -10,10 +10,9 @@ import ( "errors" "math/bits" "net" + "net/netip" "sync" "unsafe" - - "golang.zx2c4.com/go118/netip" ) type parentIndirection struct { diff --git a/device/allowedips_rand_test.go b/device/allowedips_rand_test.go index ff56fe6..0d3eecb 100644 --- a/device/allowedips_rand_test.go +++ b/device/allowedips_rand_test.go @@ -8,10 +8,9 @@ package device import ( "math/rand" "net" + "net/netip" "sort" "testing" - - "golang.zx2c4.com/go118/netip" ) const ( diff --git a/device/allowedips_test.go b/device/allowedips_test.go index a274997..b0fc817 100644 --- a/device/allowedips_test.go +++ b/device/allowedips_test.go @@ -8,9 +8,8 @@ package device import ( "math/rand" "net" + "net/netip" "testing" - - "golang.zx2c4.com/go118/netip" ) type testPairCommonBits struct { diff --git a/device/device_test.go b/device/device_test.go index 84221be..5439924 100644 --- a/device/device_test.go +++ b/device/device_test.go @@ -11,6 +11,7 @@ import ( "fmt" "io" "math/rand" + "net/netip" "runtime" "runtime/pprof" "sync" @@ -18,7 +19,6 @@ import ( "testing" "time" - "golang.zx2c4.com/go118/netip" "golang.zx2c4.com/wireguard/conn" "golang.zx2c4.com/wireguard/conn/bindtest" "golang.zx2c4.com/wireguard/tun/tuntest" diff --git a/device/endpoint_test.go b/device/endpoint_test.go index f1ae47e..b265be6 100644 --- a/device/endpoint_test.go +++ b/device/endpoint_test.go @@ -7,8 +7,7 @@ package device import ( "math/rand" - - "golang.zx2c4.com/go118/netip" + "net/netip" ) type DummyEndpoint struct { diff --git a/device/receive.go b/device/receive.go index cc34498..5857481 100644 --- a/device/receive.go +++ b/device/receive.go @@ -17,6 +17,7 @@ import ( "golang.org/x/crypto/chacha20poly1305" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" + "golang.zx2c4.com/wireguard/conn" ) diff --git a/device/send.go b/device/send.go index b05c69e..7fd90ea 100644 --- a/device/send.go +++ b/device/send.go @@ -10,6 +10,7 @@ import ( "encoding/binary" "errors" "net" + "net/netip" "os" "sync" "sync/atomic" diff --git a/device/uapi.go b/device/uapi.go index 9572fb8..beff5aa 100644 --- a/device/uapi.go +++ b/device/uapi.go @@ -12,13 +12,13 @@ import ( "fmt" "io" "net" + "net/netip" "strconv" "strings" "sync" "sync/atomic" "time" - "golang.zx2c4.com/go118/netip" "golang.zx2c4.com/wireguard/ipc" ) |