summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--bitmask_go/launcher_linux.go8
-rw-r--r--bitmask_go/launcher_windows.go72
-rw-r--r--bitmask_go/main.go11
4 files changed, 88 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 3c24c7f..d3083ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
bitmask-systray
locales/*/out.gotext.json
.*.swp
+*.exe
diff --git a/bitmask_go/launcher_linux.go b/bitmask_go/launcher_linux.go
index 12bd1cb..4046fa5 100644
--- a/bitmask_go/launcher_linux.go
+++ b/bitmask_go/launcher_linux.go
@@ -38,10 +38,14 @@ type launcher struct {
openvpnCh chan []string
}
-func newLauncher() *launcher {
+func newLauncher() (*launcher, error) {
l := launcher{make(chan []string, 1)}
go l.openvpnRunner()
- return &l
+ return &l, nil
+}
+
+func (l *launcher) close() error {
+ return nil
}
func (l *launcher) openvpnStart(flags ...string) error {
diff --git a/bitmask_go/launcher_windows.go b/bitmask_go/launcher_windows.go
new file mode 100644
index 0000000..cff9daa
--- /dev/null
+++ b/bitmask_go/launcher_windows.go
@@ -0,0 +1,72 @@
+// +build windows
+// Copyright (C) 2018 LEAP
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package bitmask
+
+import (
+ "encoding/json"
+ "net/textproto"
+)
+
+const (
+ helperAddr = "localhost:7171"
+)
+
+type launcher struct {
+ conn *textproto.Conn
+}
+
+func newLauncher() (*launcher, error) {
+ conn, err := textproto.Dial("tcp", helperAddr)
+ return &launcher{conn}, err
+}
+
+func (l *launcher) close() error {
+ return l.conn.Close()
+}
+
+func (l *launcher) openvpnStart(flags ...string) error {
+ return l.send("openvpn_start", flags...)
+}
+
+func (l *launcher) openvpnStop() error {
+ return l.send("openvpn_stop")
+}
+
+func (l *launcher) firewallStart(gateways []gateway) error {
+ return nil
+}
+
+func (l *launcher) firewallStop() error {
+ return nil
+}
+
+func (l *launcher) send(cmd string, args ...string) error {
+ if args == nil {
+ args = []string{}
+ }
+ command := struct {
+ Cmd string `json:"cmd"`
+ Args []string `json:"args"`
+ }{cmd, args}
+ bytesCmd, err := json.Marshal(command)
+ if err != nil {
+ return err
+ }
+
+ _, err = l.conn.Cmd(string(bytesCmd))
+ return err
+}
diff --git a/bitmask_go/main.go b/bitmask_go/main.go
index fee4a42..357d53f 100644
--- a/bitmask_go/main.go
+++ b/bitmask_go/main.go
@@ -40,7 +40,10 @@ func Init() (*Bitmask, error) {
return nil, err
}
bonafide := newBonafide()
- launch := newLauncher()
+ launch, err := newLauncher()
+ if err != nil {
+ return nil, err
+ }
b := Bitmask{tempdir, statusCh, nil, bonafide, launch}
err = b.StopVPN()
@@ -70,7 +73,11 @@ func (b *Bitmask) GetStatusCh() <-chan string {
// Close the connection to bitmask
func (b *Bitmask) Close() {
b.StopVPN()
- err := os.RemoveAll(b.tempdir)
+ err := b.launch.close()
+ if err != nil {
+ log.Printf("There was an error closing the launcher: %v", err)
+ }
+ err = os.RemoveAll(b.tempdir)
if err != nil {
log.Printf("There was an error removing temp dir: %v", err)
}