summaryrefslogtreecommitdiff
path: root/pkg/bitmask/init.go
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2020-06-12 20:35:48 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-06-12 20:35:48 +0200
commit4faad2cda4938806126c482c7f93b640d68b9fe8 (patch)
treee475b65a59ecdfac09bedc7b2ae380736de09c16 /pkg/bitmask/init.go
parent0ac0afaaf312a02af01d1c307ecf9b5915f40b0d (diff)
[refactor] rename standalone to just vpn
Diffstat (limited to 'pkg/bitmask/init.go')
-rw-r--r--pkg/bitmask/init.go13
1 files changed, 12 insertions, 1 deletions
diff --git a/pkg/bitmask/init.go b/pkg/bitmask/init.go
index 9af7948..7f10ab9 100644
--- a/pkg/bitmask/init.go
+++ b/pkg/bitmask/init.go
@@ -16,6 +16,7 @@
package bitmask
import (
+ "errors"
"log"
"os"
"path"
@@ -25,6 +26,7 @@ import (
"0xacab.org/leap/bitmask-vpn/pkg/config"
"0xacab.org/leap/bitmask-vpn/pkg/pid"
+ "0xacab.org/leap/bitmask-vpn/pkg/vpn"
)
type ProviderInfo struct {
@@ -45,6 +47,15 @@ func InitializeLogger() {
}
}
+func initBitmask(printer *message.Printer) (Bitmask, error) {
+ b, err := vpn.Init()
+ if err != nil {
+ log.Printf("An error ocurred starting bitmask: %v", err)
+ err = errors.New(printer.Sprintf(errorMsg, err))
+ }
+ return b, err
+}
+
func InitializeBitmask() (Bitmask, error) {
if _, err := os.Stat(config.Path); os.IsNotExist(err) {
os.MkdirAll(config.Path, os.ModePerm)
@@ -60,7 +71,7 @@ func InitializeBitmask() (Bitmask, error) {
conf.Version = "unknown"
conf.Printer = initPrinter()
- b, err := Init(conf.Printer)
+ b, err := initBitmask(conf.Printer)
if err != nil {
// TODO notify failure
log.Fatal(err)