Add state "disabled" to TrafPol State D-Bus Property

Signed-off-by: hwipl <33433250+hwipl@users.noreply.github.com>
telekom-mms · Aug 20, 2024 · 5e4a980 · 5e4a980
1 parent ee966af
commit 5e4a980
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go
@@ -762,7 +762,11 @@ func (d *Daemon) stopTrafPol() {
 	d.serverIPAllowed = false
 
 	// update trafpol status
-	d.setStatusTrafPolState(vpnstatus.TrafPolStateInactive)
+	if d.disableTrafPol {
+		d.setStatusTrafPolState(vpnstatus.TrafPolStateDisabled)
+	} else {
+		d.setStatusTrafPolState(vpnstatus.TrafPolStateInactive)
+	}
 	d.setStatusAllowedHosts(nil)
 }
 

diff --git a/pkg/vpnstatus/status.go b/pkg/vpnstatus/status.go
@@ -105,6 +105,7 @@ const (
 	TrafPolStateUnknown = iota
 	TrafPolStateInactive
 	TrafPolStateActive
+	TrafPolStateDisabled
 )
 
 // String resturns TrafPolState as string.
@@ -116,6 +117,8 @@ func (t TrafPolState) String() string {
 		return "inactive"
 	case TrafPolStateActive:
 		return "active"
+	case TrafPolStateDisabled:
+		return "disabled"
 	}
 	return ""
 }

diff --git a/pkg/vpnstatus/status_test.go b/pkg/vpnstatus/status_test.go
@@ -123,6 +123,7 @@ func TestTrafPolStateString(t *testing.T) {
 		TrafPolStateUnknown:  "unknown",
 		TrafPolStateInactive: "inactive",
 		TrafPolStateActive:   "active",
+		TrafPolStateDisabled: "disabled",
 
 		// invalid
 		123456: "",