From 0f20d7403f25e8ed7b0d01997be019c561525fba Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 23 Jun 2020 19:51:00 +0200
Subject: [PATCH] [refactor] cleanup function was unneeded
---
pkg/backend/actions.go | 4 ++++
pkg/backend/api.go | 5 +++--
pkg/backend/cleanup.go | 9 ---------
pkg/vpn/main.go | 12 +-----------
4 files changed, 8 insertions(+), 22 deletions(-)
delete mode 100644 pkg/backend/cleanup.go
diff --git a/pkg/backend/actions.go b/pkg/backend/actions.go
index 725a550f..ca453475 100644
--- a/pkg/backend/actions.go
+++ b/pkg/backend/actions.go
@@ -19,3 +19,7 @@ func stopVPN() {
log.Println(err)
}
}
+
+func closeVPN() {
+ ctx.bm.Close()
+}
diff --git a/pkg/backend/api.go b/pkg/backend/api.go
index cf9ec5c8..58e0a426 100644
--- a/pkg/backend/api.go
+++ b/pkg/backend/api.go
@@ -30,10 +30,11 @@ func Unblock() {
func Quit() {
if ctx.Status != off {
go setStatus(stopping)
+ ctx.cfg.SetUserStoppedVPN(false)
+ } else {
ctx.cfg.SetUserStoppedVPN(true)
- stopVPN()
}
- cleanup()
+ closeVPN()
}
func DonateAccepted() {
diff --git a/pkg/backend/cleanup.go b/pkg/backend/cleanup.go
deleted file mode 100644
index 16f36e47..00000000
--- a/pkg/backend/cleanup.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package backend
-
-import (
- "0xacab.org/leap/bitmask-vpn/pkg/vpn"
-)
-
-func cleanup() {
- vpn.Cleanup()
-}
diff --git a/pkg/vpn/main.go b/pkg/vpn/main.go
index f3c5b833..4bf43950 100644
--- a/pkg/vpn/main.go
+++ b/pkg/vpn/main.go
@@ -19,8 +19,6 @@ import (
"io/ioutil"
"log"
"os"
- "path"
- "path/filepath"
"0xacab.org/leap/bitmask-vpn/pkg/config"
"0xacab.org/leap/bitmask-vpn/pkg/vpn/bonafide"
@@ -76,7 +74,7 @@ func (b *Bitmask) GetStatusCh() <-chan string {
return b.statusCh
}
-// Close the connection to bitmask
+// Close the connection to bitmask, and does cleanup of temporal files
func (b *Bitmask) Close() {
log.Printf("Close: cleanup and vpn shutdown...")
b.StopVPN()
@@ -94,11 +92,3 @@ func (b *Bitmask) Close() {
func (b *Bitmask) Version() (string, error) {
return "", nil
}
-
-func Cleanup() {
- dirs, _ := filepath.Glob(path.Join(os.TempDir(), "leap-*"))
- for _, d := range dirs {
- log.Println("removing temp dir:", d)
- os.RemoveAll(d)
- }
-}
--
GitLab