Merge pull request #83 from telekom-mms/feature/update-dbus-and-statu…

…s-defaults Feature/update dbus and status defaults
telekom-mms · May 13, 2024 · cef4fde · cef4fde
2 parents 9198016 + f7547c4
commit cef4fde
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go
@@ -779,8 +779,10 @@ func (d *Daemon) Start() error {
 	}
 
 	// set initial status
+	d.setStatusTrustedNetwork(false)
 	d.setStatusConnectionState(vpnstatus.ConnectionStateDisconnected)
 	d.setStatusServers(d.profile.GetVPNServerHostNames())
+	d.setStatusConnectedAt(0)
 
 	go d.start()
 	return nil

diff --git a/internal/dbusapi/service.go b/internal/dbusapi/service.go
@@ -217,17 +217,22 @@ func (s *Service) start() {
 	defer close(s.closed)
 	defer func() { _ = s.conn.Close() }()
 
+	// helper for setting initial property values
+	setInitialProps := func() {
+		s.props.SetMust(Interface, PropertyTrustedNetwork, TrustedNetworkUnknown)
+		s.props.SetMust(Interface, PropertyConnectionState, ConnectionStateUnknown)
+		s.props.SetMust(Interface, PropertyIP, IPInvalid)
+		s.props.SetMust(Interface, PropertyDevice, DeviceInvalid)
+		s.props.SetMust(Interface, PropertyServer, ServerInvalid)
+		s.props.SetMust(Interface, PropertyConnectedAt, ConnectedAtInvalid)
+		s.props.SetMust(Interface, PropertyServers, ServersInvalid)
+		s.props.SetMust(Interface, PropertyOCRunning, OCRunningUnknown)
+		s.props.SetMust(Interface, PropertyVPNConfig, VPNConfigInvalid)
+	}
+
 	// set properties values to emit properties changed signal and make
 	// sure existing clients get updated values after restart
-	s.props.SetMust(Interface, PropertyTrustedNetwork, TrustedNetworkNotTrusted)
-	s.props.SetMust(Interface, PropertyConnectionState, ConnectionStateDisconnected)
-	s.props.SetMust(Interface, PropertyIP, IPInvalid)
-	s.props.SetMust(Interface, PropertyDevice, DeviceInvalid)
-	s.props.SetMust(Interface, PropertyServer, ServerInvalid)
-	s.props.SetMust(Interface, PropertyConnectedAt, ConnectedAtInvalid)
-	s.props.SetMust(Interface, PropertyServers, ServersInvalid)
-	s.props.SetMust(Interface, PropertyOCRunning, OCRunningNotRunning)
-	s.props.SetMust(Interface, PropertyVPNConfig, VPNConfigInvalid)
+	setInitialProps()
 
 	// main loop
 	for {
@@ -244,15 +249,7 @@ func (s *Service) start() {
 			log.Debug("D-Bus service stopping")
 			// set properties values to unknown/invalid to emit
 			// properties changed signal and inform clients
-			s.props.SetMust(Interface, PropertyTrustedNetwork, TrustedNetworkUnknown)
-			s.props.SetMust(Interface, PropertyConnectionState, ConnectionStateUnknown)
-			s.props.SetMust(Interface, PropertyIP, IPInvalid)
-			s.props.SetMust(Interface, PropertyDevice, DeviceInvalid)
-			s.props.SetMust(Interface, PropertyServer, ServerInvalid)
-			s.props.SetMust(Interface, PropertyConnectedAt, ConnectedAtInvalid)
-			s.props.SetMust(Interface, PropertyServers, ServersInvalid)
-			s.props.SetMust(Interface, PropertyOCRunning, OCRunningUnknown)
-			s.props.SetMust(Interface, PropertyVPNConfig, VPNConfigInvalid)
+			setInitialProps()
 			return
 		}
 	}

diff --git a/pkg/vpnstatus/status.go b/pkg/vpnstatus/status.go
@@ -145,5 +145,7 @@ func NewFromJSON(b []byte) (*Status, error) {
 
 // New returns a new Status.
 func New() *Status {
-	return &Status{}
+	return &Status{
+		ConnectedAt: -1,
+	}
 }