diff options
| author |   Josh Bleecher Snyder <josh@tailscale.com> | 2022-03-16 16:09:48 -0700 |
|---|---|---|
| committer | Josh Bleecher Snyder <josh@tailscale.com> | 2022-03-16 16:09:48 -0700 |
| commit | 42c9af45e12dbb2de4d3c273bfc7deeda984f827 (patch) | |
| tree | 67d59df66ccd8683f92efb256323257adb240e5b /conn | |
| parent | tun/netstack: check error returned by SetDeadline() (diff) | |
| download | wireguard-go-42c9af45e12dbb2de4d3c273bfc7deeda984f827.tar.xz wireguard-go-42c9af45e12dbb2de4d3c273bfc7deeda984f827.zip | |
all: update to Go 1.18
Bump go.mod and README.
Switch to upstream net/netip.
Use strings.Cut.
Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
Diffstat (limited to 'conn')
| -rw-r--r-- | conn/bind_linux.go | 2 | ||||
| -rw-r--r-- | conn/bind_std.go | 3 | ||||
| -rw-r--r-- | conn/bind_windows.go | 2 | ||||
| -rw-r--r-- | conn/bindtest/bindtest.go | 2 | ||||
| -rw-r--r-- | conn/conn.go | 3 |
5 files changed, 5 insertions, 7 deletions
diff --git a/conn/bind_linux.go b/conn/bind_linux.go index b3d755c..f11f031 100644 --- a/conn/bind_linux.go +++ b/conn/bind_linux.go @@ -8,13 +8,13 @@ package conn import ( "errors" "net" + "net/netip" "strconv" "sync" "syscall" "unsafe" "golang.org/x/sys/unix" - "golang.zx2c4.com/go118/netip" ) type ipv4Source struct { diff --git a/conn/bind_std.go b/conn/bind_std.go index de03b10..ab800ba 100644 --- a/conn/bind_std.go +++ b/conn/bind_std.go @@ -8,10 +8,9 @@ package conn import ( "errors" "net" + "net/netip" "sync" "syscall" - - "golang.zx2c4.com/go118/netip" ) // StdNetBind is meant to be a temporary solution on platforms for which diff --git a/conn/bind_windows.go b/conn/bind_windows.go index 476e277..9268bc1 100644 --- a/conn/bind_windows.go +++ b/conn/bind_windows.go @@ -9,13 +9,13 @@ import ( "encoding/binary" "io" "net" + "net/netip" "strconv" "sync" "sync/atomic" "unsafe" "golang.org/x/sys/windows" - "golang.zx2c4.com/go118/netip" "golang.zx2c4.com/wireguard/conn/winrio" ) diff --git a/conn/bindtest/bindtest.go b/conn/bindtest/bindtest.go index 6fc1972..b38cae6 100644 --- a/conn/bindtest/bindtest.go +++ b/conn/bindtest/bindtest.go @@ -9,9 +9,9 @@ import ( "fmt" "math/rand" "net" + "net/netip" "os" - "golang.zx2c4.com/go118/netip" "golang.zx2c4.com/wireguard/conn" ) diff --git a/conn/conn.go b/conn/conn.go index 35fb6b1..5a93b2b 100644 --- a/conn/conn.go +++ b/conn/conn.go @@ -9,11 +9,10 @@ package conn import ( "errors" "fmt" + "net/netip" "reflect" "runtime" "strings" - - "golang.zx2c4.com/go118/netip" ) // A ReceiveFunc receives a single inbound packet from the network. |