Fixup status generation for NetmgrController

Author: oskirby

src/platforms/linux/netmgrcontroller.cpp

@@ -66,7 +66,8 @@ void NetmgrController::initialize(const Device* device, const Keys* keys) {
   }
   m_uuid = uuid.toString(QUuid::WithoutBraces);
 
-  m_deviceIpv4Address = device->ipv4Address();
+  m_deviceIpv4Address = QHostAddress(device->ipv4Address().split('/').first());
+  m_deviceIpv6Address = QHostAddress(device->ipv6Address().split('/').first());
 
   // Generic connection settings.
   m_config.insert("id", QCoreApplication::applicationName());
@@ -248,11 +249,16 @@ void NetmgrController::activate(const InterfaceConfig& config,
   m_ipv6config.insert("route-data", ipv6routes);
   m_wireguard.insert("peers", peers);
 
+  // Keep the server details for later.
+  m_serverPublicKey = config.m_serverPublicKey;
+  m_serverIpv4Gateway = QHostAddress(config.m_serverIpv4Gateway);
+  m_serverIpv6Gateway = QHostAddress(config.m_serverIpv6Gateway);
+
   // Update the DNS server.
   if ((config.m_dnsServer == config.m_serverIpv4Gateway) ||
       (config.m_dnsServer == config.m_serverIpv6Gateway)) {
-    setDnsConfig(m_ipv4config, QHostAddress(config.m_serverIpv4Gateway));
-    setDnsConfig(m_ipv6config, QHostAddress(config.m_serverIpv6Gateway));
+    setDnsConfig(m_ipv4config, m_serverIpv4Gateway);
+    setDnsConfig(m_ipv6config, m_serverIpv6Gateway);
   } else if (config.m_dnsServer.contains(':')) {
     setDnsConfig(m_ipv4config, QHostAddress());
     setDnsConfig(m_ipv6config, QHostAddress(config.m_dnsServer));
@@ -261,10 +267,6 @@ void NetmgrController::activate(const InterfaceConfig& config,
     setDnsConfig(m_ipv6config, QHostAddress());
   }
 
-  // Keep the server details for later.
-  m_serverPublicKey = config.m_serverPublicKey;
-  m_serverIpv4Gateway = config.m_serverIpv4Gateway;
-
   // Update the connection settings.
   QList<QVariant> args;
   args << serializeConfig();
@@ -395,7 +397,9 @@ void NetmgrController::checkStatus() {
   st.m_connected = true;
   st.m_timestamp = guessUptime();
   st.m_ipv4Gateway = m_serverIpv4Gateway;
+  st.m_ipv6Gateway = m_serverIpv6Gateway;
   st.m_ipv4Address = m_deviceIpv4Address;
+  st.m_ipv6Address = m_deviceIpv6Address;
   st.m_rxBytes = readSysfsFile(rxPath);
   st.m_txBytes = readSysfsFile(txPath);
 

src/platforms/linux/netmgrcontroller.h

@@ -6,6 +6,7 @@
 #define NETWORKMANAGERCONTROLLER_H
 
 #include <QDBusObjectPath>
+#include <QHostAddress>
 #include <QObject>
 #include <QVariant>
 #include <QVersionNumber>
@@ -75,8 +76,10 @@ class NetmgrController final : public ControllerImpl {
   QVariantMap m_wireguard;
 
   QString m_serverPublicKey;
-  QString m_serverIpv4Gateway;
-  QString m_deviceIpv4Address;
+  QHostAddress m_serverIpv4Gateway;
+  QHostAddress m_serverIpv6Gateway;
+  QHostAddress m_deviceIpv4Address;
+  QHostAddress m_deviceIpv6Address;
   QString m_uuid;
 
   QVersionNumber m_version;