diff options
Diffstat (limited to '')
-rw-r--r-- | ipc/uapi_bsd.go | 71 |
1 files changed, 1 insertions, 70 deletions
diff --git a/ipc/uapi_bsd.go b/ipc/uapi_bsd.go index a74a7ed..d552a5e 100644 --- a/ipc/uapi_bsd.go +++ b/ipc/uapi_bsd.go @@ -9,25 +9,13 @@ package ipc import ( "errors" - "fmt" "net" "os" - "path" "unsafe" "golang.org/x/sys/unix" ) -var socketDirectory = "/var/run/wireguard" - -const ( - IpcErrorIO = -int64(unix.EIO) - IpcErrorProtocol = -int64(unix.EPROTO) - IpcErrorInvalid = -int64(unix.EINVAL) - IpcErrorPortInUse = -int64(unix.EADDRINUSE) - socketName = "%s.sock" -) - type UAPIListener struct { listener net.Listener // unix socket listener connNew chan net.Conn @@ -84,10 +72,7 @@ func UAPIListen(name string, file *os.File) (net.Listener, error) { unixListener.SetUnlinkOnClose(true) } - socketPath := path.Join( - socketDirectory, - fmt.Sprintf(socketName, name), - ) + socketPath := sockPath(name) // watch for deletion of socket @@ -146,57 +131,3 @@ func UAPIListen(name string, file *os.File) (net.Listener, error) { return uapi, nil } - -func UAPIOpen(name string) (*os.File, error) { - - // check if path exist - - if err := os.MkdirAll(socketDirectory, 0755); err != nil { - return nil, err - } - - // open UNIX socket - - socketPath := path.Join( - socketDirectory, - fmt.Sprintf(socketName, name), - ) - - addr, err := net.ResolveUnixAddr("unix", socketPath) - if err != nil { - return nil, err - } - - oldUmask := unix.Umask(0077) - listener, err := func() (*net.UnixListener, error) { - - // initial connection attempt - - listener, err := net.ListenUnix("unix", addr) - if err == nil { - return listener, nil - } - - // check if socket already active - - _, err = net.Dial("unix", socketPath) - if err == nil { - return nil, errors.New("unix socket in use") - } - - // cleanup & attempt again - - err = os.Remove(socketPath) - if err != nil { - return nil, err - } - return net.ListenUnix("unix", addr) - }() - unix.Umask(oldUmask) - - if err != nil { - return nil, err - } - - return listener.File() -} |