Clean up error handling of listen port

diff --git a/src/uapi.go b/src/uapi.go
index 034033ac06ff1de5d26ff469fa528016b7f93061..326216bb5848a2766ee0c63629a8c053fc67adce 100644 (file)
--- a/src/uapi.go
+++ b/src/uapi.go
@@ -151,7 +151,7 @@ func ipcSetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
                                err = updateUDPConn(device)
                                if err != nil {
                                        logError.Println("Failed to set listen_port:", err)
-                                       return &IPCError{Code: ipcErrorIO}
+                                       return &IPCError{Code: ipcErrorPortInUse}
                                }
 
                                // TODO: Clear source address of all peers

diff --git a/src/uapi_darwin.go b/src/uapi_darwin.go
index 13e5c4f1abb02336c8d1cbd6abf0823218b04607..63d4d8de7885276d55bbe7fe012cd55899c68c3e 100644 (file)
--- a/src/uapi_darwin.go
+++ b/src/uapi_darwin.go
@@ -11,9 +11,9 @@ import (
 
 const (
        ipcErrorIO         = -int64(unix.EIO)
-       ipcErrorNotDefined = -int64(unix.ENODEV)
        ipcErrorProtocol   = -int64(unix.EPROTO)
        ipcErrorInvalid    = -int64(unix.EINVAL)
+       ipcErrorPortInUse  = -int64(unix.EADDRINUSE)
        socketDirectory    = "/var/run/wireguard"
        socketName         = "%s.sock"
 )

diff --git a/src/uapi_linux.go b/src/uapi_linux.go
index db4f04018c62695a7e4f70ebcb1add4eecee129a..cb9d858f8ff15a7b214c21edf6e7dad14eac6dfd 100644 (file)
--- a/src/uapi_linux.go
+++ b/src/uapi_linux.go
@@ -11,9 +11,9 @@ import (
 
 const (
        ipcErrorIO         = -int64(unix.EIO)
-       ipcErrorNotDefined = -int64(unix.ENODEV)
        ipcErrorProtocol   = -int64(unix.EPROTO)
        ipcErrorInvalid    = -int64(unix.EINVAL)
+       ipcErrorPortInUse  = -int64(unix.EADDRINUSE)
        socketDirectory    = "/var/run/wireguard"
        socketName         = "%s.sock"
 )

diff --git a/src/uapi_windows.go b/src/uapi_windows.go
index d56e965644ce206f3e849e755e463d27a27229f2..a4599a5d5f3df989acfdde1ba97bcd280afdb352 100644 (file)
--- a/src/uapi_windows.go
+++ b/src/uapi_windows.go
@@ -12,9 +12,9 @@ import (
 
 const (
        ipcErrorIO         = -int64(windows.ERROR_BROKEN_PIPE)
-       ipcErrorNotDefined = -int64(windows.ERROR_SERVICE_SPECIFIC_ERROR)
-       ipcErrorProtocol   = -int64(windows.ERROR_SERVICE_SPECIFIC_ERROR)
-       ipcErrorInvalid    = -int64(windows.ERROR_SERVICE_SPECIFIC_ERROR)
+       ipcErrorProtocol   = -int64(windows.ERROR_INVALID_NAME)
+       ipcErrorInvalid    = -int64(windows.ERROR_INVALID_PARAMETER)
+       ipcErrorPortInUse  = -int64(windows.ERROR_ALREADY_EXISTS)
 )
 
 const PipeNameFmt = "\\\\.\\pipe\\wireguard-ipc-%s"