feat: ap flags, device connections

Author: cpwrs

src/network/CMakeLists.txt

@@ -49,18 +49,8 @@ qt_add_dbus_interface(NM_DBUS_INTERFACES
 	nm/dbus_nm_connection
 )
 
-set_source_files_properties(nm/org.freedesktop.NetworkManager.Settings.xml PROPERTIES
-	CLASSNAME DBusNMSettingsProxy
-	NO_NAMESPACE TRUE
-)
-
-qt_add_dbus_interface(NM_DBUS_INTERFACES
-	nm/org.freedesktop.NetworkManager.Settings.xml
-	nm/dbus_nm_settings
-)
-
 qt_add_library(quickshell-network STATIC
-	api.cpp
+	frontend.cpp
 	nm/backend.cpp
 	nm/device.cpp
 	nm/accesspoint.cpp

src/network/api.cpp renamed to src/network/frontend.cpp

@@ -1,4 +1,4 @@
-#include "api.hpp"
+#include "frontend.hpp"
 
 #include <qdbusconnection.h>
 #include <qdbusconnectioninterface.h>
@@ -124,16 +124,16 @@ Network::Network(QObject* parent): QObject(parent) {
 
 	// NetworkManager
 	auto* nm = new NetworkManager(this);
-	connect(nm, &NetworkBackend::ready, this, [this, nm](bool success) {
-		if (success) {
-			QObject::connect(nm, &NetworkManager::deviceAdded, this, &Network::addDevice);
-			QObject::connect(nm, &NetworkManager::deviceRemoved, this, &Network::removeDevice);
-			this->backend = nm;
-		} else {
-			delete nm;
-			qCCritical(logNetwork) << "Network will not work. Could not find an available backend.";
-		}
-	});
+	if (nm->isAvailable()) {
+		QObject::connect(nm, &NetworkManager::deviceAdded, this, &Network::addDevice);
+		QObject::connect(nm, &NetworkManager::deviceRemoved, this, &Network::removeDevice);
+		this->backend = nm;
+		return;
+	} else {
+		delete nm;
+	}
+
+	qCCritical(logNetwork) << "Network will not work. Could not find an available backend.";
 }
 
 void Network::addDevice(NetworkDevice* device) { this->mDevices.insertObject(device); }

src/network/api.hpp renamed to src/network/frontend.hpp

@@ -183,8 +183,8 @@ public slots:
 class NetworkBackend: public QObject {
 	Q_OBJECT;
 
-signals:
-	void ready(bool success);
+public:
+	[[nodiscard]] virtual bool isAvailable() const = 0;
 
 protected:
 	explicit NetworkBackend(QObject* parent = nullptr): QObject(parent) {};

src/network/nm/accesspoint.cpp

@@ -42,11 +42,11 @@ QString NMAccessPointAdapter::address() const {
 }
 QString NMAccessPointAdapter::path() const { return this->proxy ? this->proxy->path() : QString(); }
 
-NMAccessPointGroup::NMAccessPointGroup(QByteArray ssid, QObject* parent)
+NMWifiNetwork::NMWifiNetwork(QByteArray ssid, QObject* parent)
     : QObject(parent)
     , mSsid(std::move(ssid)) {}
 
-void NMAccessPointGroup::updateSignalStrength() {
+void NMWifiNetwork::updateSignalStrength() {
 	quint8 max = 0;
 	for (auto* ap: mAccessPoints) {
 		max = qMax(max, ap->getSignal());
@@ -56,7 +56,7 @@ void NMAccessPointGroup::updateSignalStrength() {
 	}
 }
 
-void NMAccessPointGroup::addAccessPoint(NMAccessPointAdapter* ap) {
+void NMWifiNetwork::addAccessPoint(NMAccessPointAdapter* ap) {
 	if (this->mAccessPoints.contains(ap)) {
 		qCWarning(logNetworkManager) << "Access point" << ap->path() << "was already in AP group";
 		return;
@@ -67,16 +67,30 @@ void NMAccessPointGroup::addAccessPoint(NMAccessPointAdapter* ap) {
 	    ap,
 	    &NMAccessPointAdapter::signalStrengthChanged,
 	    this,
-	    &NMAccessPointGroup::updateSignalStrength
+	    &NMWifiNetwork::updateSignalStrength
 	);
 	this->updateSignalStrength();
 }
 
-void NMAccessPointGroup::removeAccessPoint(NMAccessPointAdapter* ap) {
+void NMWifiNetwork::removeAccessPoint(NMAccessPointAdapter* ap) {
 	if (mAccessPoints.removeOne(ap)) {
 		QObject::disconnect(ap, nullptr, this, nullptr);
 		this->updateSignalStrength();
 	}
 }
 
 } // namespace qs::network
+
+namespace qs::dbus {
+
+DBusResult<qs::network::NM80211ApFlags::Enum>
+DBusDataTransform<qs::network::NM80211ApFlags::Enum>::fromWire(quint32 wire) {
+	return DBusResult(static_cast<qs::network::NM80211ApFlags::Enum>(wire));
+}
+
+DBusResult<qs::network::NM80211ApSecurityFlags::Enum>
+DBusDataTransform<qs::network::NM80211ApSecurityFlags::Enum>::fromWire(quint32 wire) {
+	return DBusResult(static_cast<qs::network::NM80211ApSecurityFlags::Enum>(wire));
+}
+
+} // namespace qs::dbus

src/network/nm/accesspoint.hpp

@@ -15,6 +15,66 @@
 
 namespace qs::network {
 
+class NM80211ApFlags: public QObject {
+	Q_OBJECT;
+
+public:
+	enum Enum : quint8 {
+		None = 0,
+		Privacy = 1,
+		Wps = 2,
+		WpsPbc = 4,
+		WpsPin = 8,
+	};
+	Q_ENUM(Enum);
+};
+
+class NM80211ApSecurityFlags: public QObject {
+	Q_OBJECT;
+
+public:
+	enum Enum : quint16 {
+		None = 0,
+		PairWep40 = 1,
+		PairWep104 = 2,
+		PairTkip = 4,
+		PairCcmp = 8,
+		GroupWep40 = 16,
+		GroupWep104 = 32,
+		GroupTkip = 64,
+		GroupCcmp = 128,
+		KeyMgmtPsk = 256,
+		KeyMgmt8021x = 512,
+		KeyMgmtSae = 1024,
+		KeyMgmtOwe = 2048,
+		KeyMgmtOweTm = 4096,
+		KeyMgmtEapSuiteB192 = 8192,
+	};
+	Q_ENUM(Enum);
+};
+
+} // namespace qs::network
+
+namespace qs::dbus {
+
+template <>
+struct DBusDataTransform<qs::network::NM80211ApFlags::Enum> {
+	using Wire = quint32;
+	using Data = qs::network::NM80211ApFlags::Enum;
+	static DBusResult<Data> fromWire(Wire wire);
+};
+
+template <>
+struct DBusDataTransform<qs::network::NM80211ApSecurityFlags::Enum> {
+	using Wire = quint32;
+	using Data = qs::network::NM80211ApSecurityFlags::Enum;
+	static DBusResult<Data> fromWire(Wire wire);
+};
+
+} // namespace qs::dbus
+
+namespace qs::network {
+
 // NMAccessPointAdapter wraps the state of a NetworkManager access point
 // (org.freedesktop.NetworkManager.AccessPoint)
 class NMAccessPointAdapter: public QObject {
@@ -31,28 +91,36 @@ class NMAccessPointAdapter: public QObject {
 signals:
 	void ssidChanged(const QByteArray& ssid);
 	void signalStrengthChanged(quint8 signal);
+	void wpaFlagsChanged(NM80211ApSecurityFlags::Enum wpaFlags);
+	void rsnFlagsChanged(NM80211ApSecurityFlags::Enum rsnFlags);
+	void flagsChanged(NM80211ApFlags::Enum flags);
 
 private:
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointAdapter, QByteArray, bSsid, &NMAccessPointAdapter::ssidChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointAdapter, quint8, bSignalStrength, &NMAccessPointAdapter::signalStrengthChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointAdapter, NM80211ApFlags::Enum, bFlags, &NMAccessPointAdapter::flagsChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointAdapter, NM80211ApSecurityFlags::Enum, bWpaFlags, &NMAccessPointAdapter::wpaFlagsChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointAdapter, NM80211ApSecurityFlags::Enum, bRsnFlags, &NMAccessPointAdapter::rsnFlagsChanged);
 
 	QS_DBUS_BINDABLE_PROPERTY_GROUP(NMAccessPointAdapter, accessPointProperties);
 	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pSsid, bSsid, accessPointProperties, "Ssid");
 	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pSignalStrength, bSignalStrength, accessPointProperties, "Strength");
+	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pFlags, bFlags, accessPointProperties, "Flags");
+	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pWpaFlags, bWpaFlags, accessPointProperties, "WpaFlags");
+	QS_DBUS_PROPERTY_BINDING(NMAccessPointAdapter, pRsnFlags, bRsnFlags, accessPointProperties, "RsnFlags");
 	// clang-format on
 
 	DBusNMAccessPointProxy* proxy = nullptr;
 };
 
-// NMAccessPointGroup bundles the state of access points with the same SSID
-// into a single object and supplies signals/slots to connect AP signal strength
-// to NetworkWifiNetwork signal strength
-class NMAccessPointGroup: public QObject {
+// NMWifiNetwork represents a wireless network, which aggregates all access points with
+// the same SSID. It also provides signals and slots for a frontend WifiNetwork.
+class NMWifiNetwork: public QObject {
 	Q_OBJECT;
 
 public:
-	explicit NMAccessPointGroup(QByteArray ssid, QObject* parent = nullptr);
+	explicit NMWifiNetwork(QByteArray ssid, QObject* parent = nullptr);
 	void addAccessPoint(NMAccessPointAdapter* ap);
 	void removeAccessPoint(NMAccessPointAdapter* ap);
 	void updateSignalStrength();
@@ -66,7 +134,7 @@ class NMAccessPointGroup: public QObject {
 	QByteArray mSsid;
 
 	// clang-format off
-	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPointGroup, quint8, bMaxSignal, &NMAccessPointGroup::signalStrengthChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMWifiNetwork, quint8, bMaxSignal, &NMWifiNetwork::signalStrengthChanged);
 	// clang-format on
 };
 

src/network/nm/backend.cpp

@@ -10,9 +10,8 @@
 #include <qtmetamacros.h>
 #include <qtypes.h>
 
-#include "../../dbus/bus.hpp"
 #include "../../dbus/properties.hpp"
-#include "../api.hpp"
+#include "../frontend.hpp"
 #include "device.hpp"
 #include "nm/dbus_nm_backend.h"
 #include "wireless.hpp"
@@ -25,7 +24,6 @@ Q_LOGGING_CATEGORY(logNetworkManager, "quickshell.network.networkmanager", QtWar
 
 const QString NM_SERVICE = "org.freedesktop.NetworkManager";
 const QString NM_PATH = "/org/freedesktop/NetworkManager";
-const QString NM_SETTINGS_PATH = "/org/freedesktop/NetworkManager/Settings";
 
 NetworkManager::NetworkManager(QObject* parent): NetworkBackend(parent) {
 	qCDebug(logNetworkManager) << "Starting NetworkManager Network Backend";
@@ -34,41 +32,20 @@ NetworkManager::NetworkManager(QObject* parent): NetworkBackend(parent) {
 	if (!bus.isConnected()) {
 		qCWarning(logNetworkManager
 		) << "Could not connect to DBus. NetworkManager backend will not work.";
-		emit ready(false);
 		return;
 	}
 
 	this->proxy = new DBusNetworkManagerProxy(NM_SERVICE, NM_PATH, bus, this);
 
 	if (!this->proxy->isValid()) {
 		qCDebug(logNetworkManager
-		) << "NetworkManager service is not currently running, attempting to start it.";
-
-		dbus::tryLaunchService(this, bus, NM_SERVICE, [this](bool success) {
-			if (success) {
-				qCDebug(logNetworkManager) << "Successfully launched NetworkManager backend.";
-				this->init();
-			} else {
-				qCWarning(logNetworkManager)
-				    << "Could not start NetworkManager. This network backend will not work.";
-				emit ready(false);
-			}
-		});
+		) << "NetworkManager service is not currently running. This network backend will not work";
 	} else {
 		this->init();
 	}
 }
 
 void NetworkManager::init() {
-	emit ready(true);
-
-	this->settings = new NMSettingsAdapter(NM_SETTINGS_PATH, this);
-	if (!this->settings->isValid()) {
-		qCWarning(logNetworkManager) << "Failed to connect to NetworkManager settings service.";
-		delete this->settings;
-		return;
-	}
-
 	QObject::connect(
 	    this->proxy,
 	    &DBusNetworkManagerProxy::DeviceAdded,
@@ -244,4 +221,6 @@ void NetworkManager::onDeviceRemoved(const QDBusObjectPath& path) {
 	}
 }
 
+bool NetworkManager::isAvailable() const { return this->proxy && this->proxy->isValid(); };
+
 } // namespace qs::network

src/network/nm/backend.hpp

@@ -11,7 +11,7 @@
 #include <qtypes.h>
 
 #include "../../dbus/properties.hpp"
-#include "../api.hpp"
+#include "../frontend.hpp"
 #include "connection.hpp"
 #include "device.hpp"
 #include "nm/dbus_nm_backend.h"
@@ -27,6 +27,7 @@ class NetworkManager: public NetworkBackend {
 
 public:
 	explicit NetworkManager(QObject* parent = nullptr);
+	[[nodiscard]] bool isAvailable() const override;
 
 private slots:
 	void onDeviceAdded(const QDBusObjectPath& path);
@@ -42,7 +43,6 @@ private slots:
 	NetworkDevice* bindDevice(NMDeviceAdapter* deviceAdapter);
 
 	QHash<QString, NetworkDevice*> mDeviceHash;
-	NMSettingsAdapter* settings = nullptr;
 
 	QS_DBUS_BINDABLE_PROPERTY_GROUP(NetworkManager, dbusProperties);
 	DBusNetworkManagerProxy* proxy = nullptr;