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>

README.md

@@ -46,7 +46,7 @@ This will run on OpenBSD. It does not yet support sticky sockets. Fwmark is mapp
 
 ## Building
 
-This requires an installation of [go](https://golang.org) ≥ 1.17.
+This requires an installation of [go](https://golang.org) ≥ 1.18.
 
 ```
 $ git clone https://git.zx2c4.com/wireguard-go

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 {

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

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"
 )

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"
 )
 

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.

device/allowedips.go

@@ -11,10 +11,9 @@ import (
 	"errors"
 	"math/bits"
 	"net"
+	"net/netip"
 	"sync"
 	"unsafe"
-
-	"golang.zx2c4.com/go118/netip"
 )
 
 type parentIndirection struct {

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 (

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 {

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"

device/endpoint_test.go

@@ -7,8 +7,7 @@ package device
 
 import (
 	"math/rand"
-
+	"net/netip"
-	"golang.zx2c4.com/go118/netip"
 )
 
 type DummyEndpoint struct {

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"
 )
 
@@ -161,12 +161,10 @@ func (device *Device) IpcSetOperation(r io.Reader) (err error) {
 			peer.handlePostConfig()
 			return nil
 		}
-		parts := strings.Split(line, "=")
+		key, value, ok := strings.Cut(line, "=")
-		if len(parts) != 2 {
+		if !ok {
-			return ipcErrorf(ipc.IpcErrorProtocol, "failed to parse line %q, found %d =-separated parts, want 2", line, len(parts))
+			return ipcErrorf(ipc.IpcErrorProtocol, "failed to parse line %q", line)
 		}
-		key := parts[0]
-		value := parts[1]
 
 		if key == "public_key" {
 			if deviceConfig {

go.mod

@@ -1,6 +1,6 @@
 module golang.zx2c4.com/wireguard
 
-go 1.17
+go 1.18
 
 require (
 	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa

ratelimiter/ratelimiter.go

@@ -6,10 +6,9 @@
 package ratelimiter
 
 import (
+	"net/netip"
 	"sync"
 	"time"
-
-	"golang.zx2c4.com/go118/netip"
 )
 
 const (

ratelimiter/ratelimiter_test.go

@@ -6,10 +6,9 @@
 package ratelimiter
 
 import (
+	"net/netip"
 	"testing"
 	"time"
-
-	"golang.zx2c4.com/go118/netip"
 )
 
 type result struct {

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"

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"

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"

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"

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"
 )