gdbus evnet memmory leak fixes

cmuhammedrafi · Dec 11, 2024 · c7996ab · c7996ab
1 parent a5d5c01
commit c7996ab
Show file tree

Hide file tree

Showing 8 changed files with 249 additions and 179 deletions.
diff --git a/NetworkManagerLogger.cpp b/NetworkManagerLogger.cpp
@@ -34,7 +34,7 @@
 #endif
 
 namespace NetworkManagerLogger {
-    static LogLevel gDefaultLogLevel = INFO_LEVEL;
+    static LogLevel gDefaultLogLevel = DEBUG_LEVEL;
 
 
 #ifdef USE_RDK_LOGGER

diff --git a/Tests/raspberrypi/NetworkManagerGdbusTest.cpp b/Tests/raspberrypi/NetworkManagerGdbusTest.cpp
@@ -4,6 +4,7 @@
 #include "NetworkManagerGdbusEvent.h"
 #include "INetworkManager.h"
 #include "NetworkManagerGdbusUtils.h"
+#include "NetworkManagerImplementation.h"
 #include <iostream>
 #include <thread>
 #include <chrono>
@@ -15,7 +16,46 @@ using namespace WPEFramework::Plugin;
 using namespace WPEFramework::Exchange;
 using namespace std;
 
-void displayMenu() {
+namespace WPEFramework
+{
+   namespace Plugin
+    {
+
+        void NetworkManagerImplementation::ReportInterfaceStateChange(const Exchange::INetworkManager::InterfaceState state, const string interface)
+        {
+            NMLOG_INFO("calling 'ReportInterfaceStateChange' cb");
+        }
+        void NetworkManagerImplementation::ReportActiveInterfaceChange(const string prevActiveInterface, const string currentActiveinterface)
+        {
+            NMLOG_INFO("calling 'ReportActiveInterfaceChange' cb");
+        }
+        void NetworkManagerImplementation::ReportIPAddressChange(const string interface, const string ipversion, const string ipaddress, const Exchange::INetworkManager::IPStatus status)
+        {
+            NMLOG_INFO("calling 'ReportIPAddressChange' cb");
+        }
+        void NetworkManagerImplementation::ReportInternetStatusChange(const Exchange::INetworkManager::InternetStatus prevState, const Exchange::INetworkManager::InternetStatus currState)
+        {
+            NMLOG_INFO("calling 'ReportInternetStatusChange' cb");
+        }
+        void NetworkManagerImplementation::ReportAvailableSSIDs(JsonArray &arrayofWiFiScanResults)
+        {
+            NMLOG_INFO("calling 'ReportAvailableSSIDs' cb");
+        }
+        void NetworkManagerImplementation::ReportWiFiStateChange(const Exchange::INetworkManager::WiFiState state)
+        {
+            NMLOG_INFO("calling 'ReportWiFiStateChange' cb");
+        }
+        void NetworkManagerImplementation::ReportWiFiSignalStrengthChange(const string ssid, const string strength, const Exchange::INetworkManager::WiFiSignalQuality quality)
+        {
+            NMLOG_INFO("calling 'ReportWiFiSignalStrengthChange' cb");
+        }
+
+        NetworkManagerImplementation* _instance = nullptr;
+    }
+}
+
+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;
@@ -31,7 +71,8 @@ void displayMenu() {
     std::cout << "-------------------------------------" << std::endl;
 }
 
-WPEFramework::Exchange::INetworkManager::WIFISecurityMode getSecurityType() {
+WPEFramework::Exchange::INetworkManager::WIFISecurityMode getSecurityType()
+{
     int securityChoice;
     std::cout << "Select Security Type:" << std::endl;
     std::cout << "1. WPA/WPA2 PSK AES" << std::endl;
@@ -52,8 +93,8 @@ WPEFramework::Exchange::INetworkManager::WIFISecurityMode getSecurityType() {
     }
 }
 
-
-void printSSIDs(const std::list<std::string>& ssids) {
+void printSSIDs(const std::list<std::string>& ssids)
+{
     if (ssids.empty()) {
         std::cout << "No SSIDs found" << std::endl;
     } else {
@@ -64,13 +105,14 @@ void printSSIDs(const std::list<std::string>& ssids) {
     }
 }
 
-int main() {
-
-    DbusMgr test;
+
+int main()
+{
+
     NetworkManagerClient* nmClient = NetworkManagerClient::getInstance();
     NetworkManagerEvents* nmEvents = NetworkManagerEvents::getInstance();
     int choice = -1;
-    
+
     while (choice != 0) {
         displayMenu();
         std::cout << "Enter your choice: \n";

diff --git a/gdbus/NetworkManagerGdbusClient.cpp b/gdbus/NetworkManagerGdbusClient.cpp
@@ -52,13 +52,7 @@ namespace WPEFramework
             if(ConnProxy == NULL)
                 return false;
 
-            settingsProxy = g_dbus_proxy_call_sync(ConnProxy,
-                                    "GetSettings",
-                                    NULL,
-                                    G_DBUS_CALL_FLAGS_NONE,
-                                    -1,
-                                    NULL,
-                                    &error);
+            settingsProxy = g_dbus_proxy_call_sync(ConnProxy, "GetSettings", NULL, G_DBUS_CALL_FLAGS_NONE, -1,  NULL, &error);
             if (!settingsProxy) {
                 g_dbus_error_strip_remote_error(error);
                 NMLOG_ERROR("Failed to get connection settings: %s", error->message);
@@ -156,13 +150,7 @@ namespace WPEFramework
             if(ConnProxy == NULL)
                 return false;
 
-            deleteVar = g_dbus_proxy_call_sync(ConnProxy,
-                                    "Delete",
-                                    NULL,
-                                    G_DBUS_CALL_FLAGS_NONE,
-                                    -1,
-                                    NULL,
-                                    &error);
+            deleteVar = g_dbus_proxy_call_sync(ConnProxy, "Delete", NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
             if (!deleteVar) {
                 g_dbus_error_strip_remote_error(error);
                 NMLOG_ERROR("Failed to get connection settings: %s", error->message);
@@ -886,17 +874,19 @@ namespace WPEFramework
             wProxy = m_dbus.getNetworkManagerDeviceProxy(devInfo.path.c_str());
             if(wProxy == NULL)
                 return false;
-
+            else
             g_dbus_proxy_call_sync(wProxy, "Disconnect", NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+                return true;
             if (error) {
                 NMLOG_ERROR("Error calling Disconnect method: %s", error->message);
                 g_error_free(error);
                 g_object_unref(wProxy);
                 return false;
             }
             else
-               NMLOG_INFO("wifi disconnected success"); 
+               NMLOG_INFO("wifi disconnected success");
 
+            g_object_unref(wProxy);
             return true;
         }