snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplified xplatform spec

Browse source
This commit is contained in:
Jason A. Donenfeld 2017-09-26 14:26:12 +02:00
parent eefa47b0f9
commit 012e7b9d33
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/uapi.go
View file

@ -124,16 +124,12 @@ func ipcSetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
switch key { switch key {
case "private_key": case "private_key":
var sk NoisePrivateKey var sk NoisePrivateKey
if value == "" { err := sk.FromHex(value)
device.SetPrivateKey(sk) if err != nil {
} else { logError.Println("Failed to set private_key:", err)
err := sk.FromHex(value) return &IPCError{Code: ipcErrorInvalid}
if err != nil {
logError.Println("Failed to set private_key:", err)
return &IPCError{Code: ipcErrorInvalid}
}
device.SetPrivateKey(sk)
} }
device.SetPrivateKey(sk)
case "listen_port": case "listen_port":
port, err := strconv.ParseUint(value, 10, 16) 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 // TODO: Clear source address of all peers
case "fwmark": case "fwmark":
var fwmark uint64 = 0 fwmark, err := strconv.ParseUint(value, 10, 32)
if value != "" { if err != nil {
var err error logError.Println("Invalid fwmark", err)
fwmark, err = strconv.ParseUint(value, 10, 32) return &IPCError{Code: ipcErrorInvalid}
if err != nil {
logError.Println("Invalid fwmark", err)
return &IPCError{Code: ipcErrorInvalid}
}
} }
device.net.mutex.Lock() device.net.mutex.Lock()