summaryrefslogtreecommitdiffhomepage
path: root/tun
diff options
context:
space:
mode:
authorJosh Bleecher Snyder <josh@tailscale.com>2022-03-16 16:09:48 -0700
committerJosh Bleecher Snyder <josh@tailscale.com>2022-03-16 16:09:48 -0700
commit42c9af45e12dbb2de4d3c273bfc7deeda984f827 (patch)
tree67d59df66ccd8683f92efb256323257adb240e5b /tun
parentae6bc4dd64e149270a86d649c92728432a50945f (diff)
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 'tun')
-rw-r--r--tun/netstack/examples/http_client.go2
-rw-r--r--tun/netstack/examples/http_server.go2
-rw-r--r--tun/netstack/examples/ping_client.go2
-rw-r--r--tun/netstack/tun.go2
-rw-r--r--tun/tuntest/tuntest.go2
5 files changed, 5 insertions, 5 deletions
diff --git a/tun/netstack/examples/http_client.go b/tun/netstack/examples/http_client.go
index b39b453..352c1e4 100644
--- a/tun/netstack/examples/http_client.go
+++ b/tun/netstack/examples/http_client.go
@@ -12,8 +12,8 @@ import (
"io"
"log"
"net/http"
+ "net/netip"
- "golang.zx2c4.com/go118/netip"
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun/netstack"
diff --git a/tun/netstack/examples/http_server.go b/tun/netstack/examples/http_server.go
index 40f7804..0fdf4cd 100644
--- a/tun/netstack/examples/http_server.go
+++ b/tun/netstack/examples/http_server.go
@@ -13,8 +13,8 @@ import (
"log"
"net"
"net/http"
+ "net/netip"
- "golang.zx2c4.com/go118/netip"
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun/netstack"
diff --git a/tun/netstack/examples/ping_client.go b/tun/netstack/examples/ping_client.go
index cbd54b8..a1bc7f8 100644
--- a/tun/netstack/examples/ping_client.go
+++ b/tun/netstack/examples/ping_client.go
@@ -12,12 +12,12 @@ import (
"bytes"
"log"
"math/rand"
+ "net/netip"
"time"
"golang.org/x/net/icmp"
"golang.org/x/net/ipv4"
- "golang.zx2c4.com/go118/netip"
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun/netstack"
diff --git a/tun/netstack/tun.go b/tun/netstack/tun.go
index 8b1bb7f..c26d8ed 100644
--- a/tun/netstack/tun.go
+++ b/tun/netstack/tun.go
@@ -13,13 +13,13 @@ import (
"fmt"
"io"
"net"
+ "net/netip"
"os"
"regexp"
"strconv"
"strings"
"time"
- "golang.zx2c4.com/go118/netip"
"golang.zx2c4.com/wireguard/tun"
"golang.org/x/net/dns/dnsmessage"
diff --git a/tun/tuntest/tuntest.go b/tun/tuntest/tuntest.go
index bdf0467..8196c34 100644
--- a/tun/tuntest/tuntest.go
+++ b/tun/tuntest/tuntest.go
@@ -8,9 +8,9 @@ package tuntest
import (
"encoding/binary"
"io"
+ "net/netip"
"os"
- "golang.zx2c4.com/go118/netip"
"golang.zx2c4.com/wireguard/tun"
)