DELIA-66597, DELIA-66657 [RDE] - Implement GNOME support via direct G…

…-DBus call for WiFi API and Events
cmuhammedrafi · Dec 9, 2024 · a5d5c01 · a5d5c01
1 parent bf871b9
commit a5d5c01
Show file tree

Hide file tree

Showing 12 changed files with 3,241 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -171,5 +171,5 @@ write_config(PLUGINS LegacyPlugin_WiFiManagerAPIs CLASSNAME WiFiManager LOCATOR
 
 if(ENABLE_UNIT_TESTING)
     include(Tests/unit_test/unit_tests.cmake)
+    include(Tests/raspberrypi/NetworkManagerGdbusTest.cmake)
 endif(ENABLE_UNIT_TESTING)
-
diff --git a/Tests/raspberrypi/NetworkManagerGdbusTest.cmake b/Tests/raspberrypi/NetworkManagerGdbusTest.cmake
@@ -0,0 +1,39 @@
+message("building rpi test build")
+# Define the project
+set(RPI_TEST "NetworkManagerGdbusTest")
+
+# Required packages
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+pkg_check_modules(GIO REQUIRED gio-2.0)
+pkg_check_modules(LIBNM REQUIRED libnm)
+
+# Create the executable target
+add_executable(${RPI_TEST}
+                NetworkManagerLogger.cpp
+                gdbus/NetworkManagerGdbusClient.cpp
+                gdbus/NetworkManagerGdbusUtils.cpp
+                gdbus/NetworkManagerGdbusMgr.cpp
+                gdbus/NetworkManagerGdbusEvent.cpp
+                Tests/raspberrypi/NetworkManagerGdbusTest.cpp
+)
+
+# Set target properties for C++ standard
+set_target_properties(${RPI_TEST} PROPERTIES
+    CXX_STANDARD 11
+    CXX_STANDARD_REQUIRED YES
+)
+
+# Add compiler options, such as forced include of a specific header
+target_compile_options(${RPI_TEST} PRIVATE -g -Wall -include ${CMAKE_SOURCE_DIR}/INetworkManager.h)
+
+target_include_directories(${RPI_TEST} PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBNM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR})
+target_include_directories(${RPI_TEST} PRIVATE gdbus)
+# Link libraries to the target
+target_link_libraries(${RPI_TEST} ${NAMESPACE}Core::${NAMESPACE}Core ${GLIB_LIBRARIES} ${GIO_LIBRARIES} uuid)
+
+# Include directories
+target_include_directories(${RPI_TEST} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+# Install the executable to the appropriate location
+install(TARGETS ${RPI_TEST} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
diff --git a/Tests/raspberrypi/NetworkManagerGdbusTest.cpp b/Tests/raspberrypi/NetworkManagerGdbusTest.cpp
@@ -0,0 +1,232 @@
+#include "NetworkManagerGdbusClient.h"
+#include "NetworkManagerGdbusMgr.h"
+#include "NetworkManagerLogger.h"
+#include "NetworkManagerGdbusEvent.h"
+#include "INetworkManager.h"
+#include "NetworkManagerGdbusUtils.h"
+#include <iostream>
+#include <thread>
+#include <chrono>
+#include <list>
+#include <string>
+
+using namespace WPEFramework;
+using namespace WPEFramework::Plugin;
+using namespace WPEFramework::Exchange;
+using namespace std;
+
+void displayMenu() {
+    std::cout << "\n--- Network Manager API Test Menu ---" << std::endl;
+    std::cout << "1. Get Known SSIDs" << std::endl;
+    std::cout << "2. Get Available SSIDs" << std::endl;
+    std::cout << "3. Get Connected SSID" << std::endl;
+    std::cout << "4. Add to Known SSIDs" << std::endl;
+    std::cout << "5. Remove Known SSIDs" << std::endl;
+    std::cout << "6. Start WiFi Scan" << std::endl;
+    std::cout << "7. WiFi Connect" << std::endl;
+    std::cout << "8. WiFi Disconnect" << std::endl;
+    std::cout << "9. Get WiFi State" << std::endl;
+    std::cout << "10. Get WiFi Signal Strength" << std::endl;
+    std::cout << "0. Exit" << std::endl;
+    std::cout << "-------------------------------------" << std::endl;
+}
+
+WPEFramework::Exchange::INetworkManager::WIFISecurityMode getSecurityType() {
+    int securityChoice;
+    std::cout << "Select Security Type:" << std::endl;
+    std::cout << "1. WPA/WPA2 PSK AES" << std::endl;
+    std::cout << "2. WPA/WPA2 PSK TKIP" << std::endl;
+    std::cout << "3. Open (No Security)" << std::endl;
+    std::cin >> securityChoice;
+
+    switch (securityChoice) {
+        case 1:
+            return WPEFramework::Exchange::INetworkManager::WIFI_SECURITY_WPA_PSK_AES;
+        case 2:
+            return WPEFramework::Exchange::INetworkManager::WIFI_SECURITY_WPA_PSK_TKIP;
+        case 3:
+            return WPEFramework::Exchange::INetworkManager::WIFI_SECURITY_NONE;
+        default:
+            std::cout << "Invalid choice. Defaulting to open." << std::endl;
+            return WPEFramework::Exchange::INetworkManager::WIFI_SECURITY_NONE;
+    }
+}
+
+
+void printSSIDs(const std::list<std::string>& ssids) {
+    if (ssids.empty()) {
+        std::cout << "No SSIDs found" << std::endl;
+    } else {
+        std::cout << "SSIDs:" << std::endl;
+        for (const auto& ssid : ssids) {
+            std::cout << "- " << ssid << std::endl;
+        }
+    }
+}
+
+int main() {
+
+    DbusMgr test;
+    NetworkManagerClient* nmClient = NetworkManagerClient::getInstance();
+    NetworkManagerEvents* nmEvents = NetworkManagerEvents::getInstance();
+    int choice = -1;
+
+    while (choice != 0) {
+        displayMenu();
+        std::cout << "Enter your choice: \n";
+        std::cin >> choice;
+
+        switch (choice) {
+            case 1: {
+                std::list<std::string> ssids;
+                if (nmClient->getKnownSSIDs(ssids)) {
+                    printSSIDs(ssids);
+                } else {
+                    NMLOG_ERROR("Failed to get known SSIDs");
+                }
+                break;
+            }
+
+            case 2: {
+                std::list<std::string> ssids;
+                if (nmClient->getAvailableSSIDs(ssids)) {
+                    printSSIDs(ssids);
+                } else {
+                    NMLOG_ERROR("Failed to get available SSIDs");
+                }
+                break;
+            }
+
+            case 3: {
+                Exchange::INetworkManager::WiFiSSIDInfo ssidinfo;
+                if (nmClient->getConnectedSSID(ssidinfo)) {
+                    NMLOG_INFO("Connected SSID: %s", ssidinfo.ssid.c_str());
+                } else {
+                    NMLOG_ERROR("Failed to get connected SSID");
+                }
+                break;
+            }
+
+            case 4: {
+                std::string ssid, passphrase;
+                std::cout << "Enter SSID to add : ";
+                std::cin.ignore();
+                std::getline(std::cin, ssid);
+                std::cout << "Enter passphrase: ";
+                std::getline(std::cin, passphrase);
+                WPEFramework::Exchange::INetworkManager::WIFISecurityMode securityType = getSecurityType();
+                Exchange::INetworkManager::WiFiConnectTo ssidinfo = {
+                    .ssid = ssid,
+                    .passphrase = passphrase,
+                    .security = securityType,
+                    .persist = true,
+                };
+                if (nmClient->addToKnownSSIDs(ssidinfo)) {
+                    NMLOG_INFO("SSID added to known list successfully");
+                } else {
+                    NMLOG_ERROR("Failed to add SSID to known list");
+                }
+                break;
+            }
+
+            case 5: {
+                std::string ssid;
+                std::cout << "Enter SSID to remove: ";
+                std::cin >> ssid;
+                if (nmClient->removeKnownSSIDs(ssid)) {
+                    NMLOG_INFO("SSID removed successfully");
+                } else {
+                    NMLOG_ERROR("Failed to remove SSID");
+                }
+                break;
+            }
+
+            case 6: {
+                std::string ssid;
+                std::cout << "Enter SSID to scan (leave blank for all): ";
+                std::cin.ignore();
+                std::getline(std::cin, ssid);
+                    nmEvents->setwifiScanOptions(true);
+                if (nmClient->startWifiScan(ssid)) {
+                    NMLOG_INFO("WiFi scan started successfully");
+                } else {
+                    NMLOG_ERROR("Failed to start WiFi scan");
+                }
+                break;
+            }
+
+            case 7: {
+                std::string ssid, passphrase;
+                bool persist;
+
+                std::cout << "Enter SSID to connect: ";
+                std::cin.ignore();
+                std::getline(std::cin, ssid);
+
+                std::cout << "Enter passphrase: ";
+                std::getline(std::cin, passphrase);
+
+                WPEFramework::Exchange::INetworkManager::WIFISecurityMode securityType = getSecurityType();
+
+                std::cout << "Persist SSID info? (1 for yes, 0 for no): ";
+                std::cin >> persist;
+
+                Exchange::INetworkManager::WiFiConnectTo ssidinfo = {
+                    .ssid = ssid,
+                    .passphrase = passphrase,
+                    .security = securityType,
+                    .persist = persist
+                };
+
+                if (nmClient->wifiConnect(ssidinfo)) {
+                    NMLOG_INFO("Connected to WiFi successfully");
+                } else {
+                    NMLOG_ERROR("Failed to connect to WiFi");
+                }
+                break;
+            }
+
+            case 8: {
+                if (nmClient->wifiDisconnect()) {
+                    NMLOG_INFO("Disconnected from WiFi successfully");
+                } else {
+                    NMLOG_ERROR("Failed to disconnect from WiFi");
+                }
+                break;
+            }
+
+            case 9: {
+                Exchange::INetworkManager::WiFiState state;
+                if (nmClient->getWifiState(state)) {
+                    NMLOG_INFO("WiFi State: %d", state);  // Assuming state is an enum or int
+                } else {
+                    NMLOG_ERROR("Failed to get WiFi state");
+                }
+                break;
+            }
+
+            case 10: {
+                std::string ssid, signalStrength;
+                Exchange::INetworkManager::WiFiSignalQuality quality;
+                if (nmClient->getWiFiSignalStrength(ssid, signalStrength, quality)) {
+                    NMLOG_INFO("SSID: %s, Signal Strength: %s, Quality: %d", ssid.c_str(), signalStrength.c_str(), quality);
+                } else {
+                    NMLOG_ERROR("Failed to get WiFi signal strength");
+                }
+                break;
+            }
+
+            case 0:
+                std::cout << "Exiting program." << std::endl;
+                break;
+
+            default:
+                std::cout << "Invalid choice, please try again." << std::endl;
+                break;
+            }
+    }
+
+    NMLOG_INFO("Program completed successfully");
+    nmEvents->stopNetworkMangerEventMonitor();
+    return 0;
+}