Moved endpoint into interface and simplified peer

1 files changed, 16 insertions, 8 deletions

diff --git a/src/uapi.go b/src/uapi.go
index e1d0929..670ecc4 100644
--- a/src/uapi.go
+++ b/src/uapi.go
@@ -53,8 +53,8 @@ func ipcGetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
 			defer peer.mutex.RUnlock()
 			send("public_key=" + peer.handshake.remoteStatic.ToHex())
 			send("preshared_key=" + peer.handshake.presharedKey.ToHex())
-			if peer.endpoint.set {
-				send("endpoint=" + peer.endpoint.value.DstToString())
+			if peer.endpoint != nil {
+				send("endpoint=" + peer.endpoint.DstToString())
 			}
 
 			nano := atomic.LoadInt64(&peer.stats.lastHandshakeNano)
@@ -255,17 +255,25 @@ func ipcSetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
 
 			case "endpoint":
 
-				// set endpoint destination and reset handshake timer
+				// set endpoint destination
+
+				err := func() error {
+					peer.mutex.Lock()
+					defer peer.mutex.Unlock()
+
+					endpoint := NewEndpoint()
+					if err := endpoint.SetDst(value); err != nil {
+						return err
+					}
+					peer.endpoint = endpoint
+					signalSend(peer.signal.handshakeReset)
+					return nil
+				}()
 
-				peer.mutex.Lock()
-				err := peer.endpoint.value.SetDst(value)
-				peer.endpoint.set = (err == nil)
-				peer.mutex.Unlock()
 				if err != nil {
 					logError.Println("Failed to set endpoint:", value)
 					return &IPCError{Code: ipcErrorInvalid}
 				}
-				signalSend(peer.signal.handshakeReset)
 
 			case "persistent_keepalive_interval":