From 42c9af45e12dbb2de4d3c273bfc7deeda984f827 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Wed, 16 Mar 2022 16:09:48 -0700 Subject: 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 --- device/uapi.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'device/uapi.go') diff --git a/device/uapi.go b/device/uapi.go index 1994d46..746cf29 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" ) @@ -161,12 +161,10 @@ func (device *Device) IpcSetOperation(r io.Reader) (err error) { peer.handlePostConfig() return nil } - parts := strings.Split(line, "=") - if len(parts) != 2 { - return ipcErrorf(ipc.IpcErrorProtocol, "failed to parse line %q, found %d =-separated parts, want 2", line, len(parts)) + key, value, ok := strings.Cut(line, "=") + if !ok { + return ipcErrorf(ipc.IpcErrorProtocol, "failed to parse line %q", line) } - key := parts[0] - value := parts[1] if key == "public_key" { if deviceConfig { -- cgit v1.2.3