From 1dd590b91b893a413666b6daaed848d89bab7f05 Mon Sep 17 00:00:00 2001
From: Mathias Hall-Andersen <mathias@hall-andersen.dk>
Date: Sat, 13 Jan 2018 09:00:37 +0100
Subject: Work on timer teardown + bug fixes

Added waitgroups to peer struct for routine
start / stop synchronisation
---
 src/uapi.go | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/uapi.go')

diff --git a/src/uapi.go b/src/uapi.go
index a67bff1..f66528c 100644
--- a/src/uapi.go
+++ b/src/uapi.go
@@ -133,13 +133,27 @@ func ipcSetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
 				device.SetPrivateKey(sk)
 
 			case "listen_port":
+
+				// parse port number
+
 				port, err := strconv.ParseUint(value, 10, 16)
 				if err != nil {
 					logError.Println("Failed to parse listen_port:", err)
 					return &IPCError{Code: ipcErrorInvalid}
 				}
+
+				// update port and rebind
+
+				device.mutex.Lock()
+				device.net.mutex.Lock()
+
 				device.net.port = uint16(port)
-				if err := updateBind(device); err != nil {
+				err = unsafeUpdateBind(device)
+
+				device.net.mutex.Unlock()
+				device.mutex.Unlock()
+
+				if err != nil {
 					logError.Println("Failed to set listen_port:", err)
 					return &IPCError{Code: ipcErrorPortInUse}
 				}
-- 
cgit v1.2.3-59-g8ed1b