From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Tue, 26 Sep 2017 12:26:12 +0000 (+0200)
Subject: Simplified xplatform spec
X-Git-Tag: 0.0.20180514~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=012e7b9d3316023e6ea891f9fe72f15d1db6668a;p=thirdparty%2Fwireguard-go.git

Simplified xplatform spec
---

diff --git a/src/uapi.go b/src/uapi.go
index 3a2f3f9..034033a 100644
--- a/src/uapi.go
+++ b/src/uapi.go
@@ -124,16 +124,12 @@ func ipcSetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
 			switch key {
 			case "private_key":
 				var sk NoisePrivateKey
-				if value == "" {
-					device.SetPrivateKey(sk)
-				} else {
-					err := sk.FromHex(value)
-					if err != nil {
-						logError.Println("Failed to set private_key:", err)
-						return &IPCError{Code: ipcErrorInvalid}
-					}
-					device.SetPrivateKey(sk)
+				err := sk.FromHex(value)
+				if err != nil {
+					logError.Println("Failed to set private_key:", err)
+					return &IPCError{Code: ipcErrorInvalid}
 				}
+				device.SetPrivateKey(sk)
 
 			case "listen_port":
 				port, err := strconv.ParseUint(value, 10, 16)
@@ -161,14 +157,10 @@ func ipcSetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
 				// TODO: Clear source address of all peers
 
 			case "fwmark":
-				var fwmark uint64 = 0
-				if value != "" {
-					var err error
-					fwmark, err = strconv.ParseUint(value, 10, 32)
-					if err != nil {
-						logError.Println("Invalid fwmark", err)
-						return &IPCError{Code: ipcErrorInvalid}
-					}
+				fwmark, err := strconv.ParseUint(value, 10, 32)
+				if err != nil {
+					logError.Println("Invalid fwmark", err)
+					return &IPCError{Code: ipcErrorInvalid}
 				}
 
 				device.net.mutex.Lock()