diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2018-05-10 18:43:32 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2018-05-26 12:54:44 +0200 |
| commit | 8382f3b14a6e82f0359a4fe68aee077c1c8665ef (patch) | |
| tree | 1266717c6fe411e0c6e64baa200a9aa47d8b0e79 | |
| parent | 5556a15effa0d3604085bc28306be72149d1adf1 (diff) | |
[feat] configure the zmq bitmask endpoint per platform
Windows uses tcp and linux/darwin uses a local socket.
| -rw-r--r-- | bitmask/darwin.go | 2 | ||||
| -rw-r--r-- | bitmask/main.go | 8 | ||||
| -rw-r--r-- | bitmask/unix.go | 2 | ||||
| -rw-r--r-- | bitmask/windows.go | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/bitmask/darwin.go b/bitmask/darwin.go index 88d6f8b..32a9b07 100644 --- a/bitmask/darwin.go +++ b/bitmask/darwin.go @@ -18,4 +18,6 @@ package bitmask import "os" +const coreEndpoint = "ipc:///var/tmp/bitmask.core.sock" + var ConfigPath = os.Getenv("HOME") + "/Library/Preferences/leap" diff --git a/bitmask/main.go b/bitmask/main.go index a78ffab..a044c58 100644 --- a/bitmask/main.go +++ b/bitmask/main.go @@ -18,7 +18,6 @@ package bitmask import ( "encoding/json" "errors" - "fmt" "log" "time" @@ -26,9 +25,7 @@ import ( ) const ( - // On win should be: tcp://127.0.0.1:5001 - coreEndpoint = "ipc://%s/bitmask.core.sock" - timeout = time.Second * 15 + timeout = time.Second * 15 ) // Bitmask holds the bitmask client data @@ -101,7 +98,6 @@ func initCore() (*zmq4.Socket, error) { return nil, err } - endpointPwd := "/var/tmp" - err = socket.Connect(fmt.Sprintf(coreEndpoint, endpointPwd)) + err = socket.Connect(coreEndpoint) return socket, err } diff --git a/bitmask/unix.go b/bitmask/unix.go index 0c62862..a976857 100644 --- a/bitmask/unix.go +++ b/bitmask/unix.go @@ -18,4 +18,6 @@ package bitmask import "os" +const coreEndpoint = "ipc:///var/tmp/bitmask.core.sock" + var ConfigPath = os.Getenv("HOME") + "/.config/leap" diff --git a/bitmask/windows.go b/bitmask/windows.go index 8babd4b..b3d41aa 100644 --- a/bitmask/windows.go +++ b/bitmask/windows.go @@ -18,4 +18,6 @@ package bitmask import "os" +const coreEndpoint = "tcp://127.0.0.1:5001" + var ConfigPath = os.Getenv("APPDATA") + "\\leap" |