From 4faad2cda4938806126c482c7f93b640d68b9fe8 Mon Sep 17 00:00:00 2001 From: "kali kaneko (leap communications)" Date: Fri, 12 Jun 2020 20:35:48 +0200 Subject: [refactor] rename standalone to just vpn --- pkg/bitmask/init.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'pkg/bitmask/init.go') 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) -- cgit v1.2.3