From 0efd19b935452a7b0b5561f9cba56b01ba7c627f Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Fri, 24 Sep 2021 20:58:30 +0200
Subject: [feat] persist obfs4 & udp prefs

---
 pkg/backend/actions.go |  7 -------
 pkg/backend/api.go     | 16 +++++++++++++++-
 pkg/backend/init.go    |  4 ++--
 pkg/backend/status.go  |  2 ++
 4 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'pkg/backend')

diff --git a/pkg/backend/actions.go b/pkg/backend/actions.go
index 9e0941b..805c5ad 100644
--- a/pkg/backend/actions.go
+++ b/pkg/backend/actions.go
@@ -23,10 +23,3 @@ func stopVPN() {
 func getGateway() string {
 	return ctx.bm.GetCurrentGateway()
 }
-
-func setTransport(t string) {
-	err := ctx.bm.SetTransport(t)
-	if err != nil {
-		log.Println(err)
-	}
-}
diff --git a/pkg/backend/api.go b/pkg/backend/api.go
index 96f3072..51fa377 100644
--- a/pkg/backend/api.go
+++ b/pkg/backend/api.go
@@ -80,7 +80,21 @@ func UseAutomaticGateway() {
 }
 
 func SetTransport(label string) {
-	ctx.bm.SetTransport(label)
+	err := ctx.bm.SetTransport(label)
+	if err != nil {
+		log.Println(err)
+	}
+	if label == "obfs4" {
+		ctx.cfg.SetUseObfs4(true)
+	} else {
+		ctx.cfg.SetUseObfs4(false)
+	}
+	go trigger(OnStatusChanged)
+}
+
+func SetUDP(udp bool) {
+	log.Println("DEBUG setting UDP")
+	ctx.cfg.SetUseUDP(udp)
 	go trigger(OnStatusChanged)
 }
 
diff --git a/pkg/backend/init.go b/pkg/backend/init.go
index fcde725..70a3582 100644
--- a/pkg/backend/init.go
+++ b/pkg/backend/init.go
@@ -103,13 +103,13 @@ func setConfigOpts(opts *InitOpts, conf *config.Config) {
 		conf.Obfs4 = opts.Obfs4
 	}
 	if opts.DisableAutostart {
-		conf.DisableAustostart = opts.DisableAutostart
+		conf.DisableAutostart = opts.DisableAutostart
 	}
 }
 
 func initializeAutostart(conf *config.Config) bitmask.Autostart {
 	autostart := bitmask.NewAutostart(config.ApplicationName, "")
-	if conf.SkipLaunch || conf.DisableAustostart {
+	if conf.SkipLaunch || conf.DisableAutostart {
 		autostart.Disable()
 		autostart = &bitmask.DummyAutostart{}
 	}
diff --git a/pkg/backend/status.go b/pkg/backend/status.go
index c5f79d1..79b70ff 100644
--- a/pkg/backend/status.go
+++ b/pkg/backend/status.go
@@ -51,6 +51,7 @@ type connectionCtx struct {
 	CurrentCountry  string              `json:"currentCountry"`
 	BestLocation    string              `json:"bestLocation"`
 	Transport       string              `json:"transport"`
+	UseUDP          bool                `json:"udp"`
 	ManualLocation  bool                `json:"manualLocation"`
 	IsReady         bool                `json:"isReady"`
 	bm              bitmask.Bitmask
@@ -69,6 +70,7 @@ func (c *connectionCtx) toJson() ([]byte, error) {
 		c.CurrentCountry = c.bm.GetCurrentCountry()
 		c.BestLocation = c.bm.GetBestLocation(transport)
 		c.Transport = transport
+		c.UseUDP = c.cfg.UDP // TODO initialize bitmask too
 		c.ManualLocation = c.bm.IsManualLocation()
 	}
 	defer statusMutex.Unlock()
-- 
cgit v1.2.3