RDK-61444 : Network Manager Plugin to support Scan Specific SSID

plugin/gnome/NetworkManagerGnomeProxy.cpp

@@ -999,8 +999,15 @@ namespace WPEFramework
                 string tmpssidlist{};
                 while (ssids->Next(tmpssidlist) == true)
                 {
-                    m_filterSsidslist.push_back(tmpssidlist.c_str());
-                    NMLOG_DEBUG("%s added to SSID filtering", tmpssidlist.c_str());
+                    if (!tmpssidlist.empty())
+                    {
+                        m_filterSsidslist.push_back(tmpssidlist.c_str());
+                        NMLOG_DEBUG("%s added to SSID filtering", tmpssidlist.c_str());
+                    }
+                    else 
+                    {
+                        NMLOG_DEBUG("Empty SSID encountered in input list; skipping.");
+                    }
                 }
             }
 
@@ -1011,7 +1018,7 @@ namespace WPEFramework
             }
 
             nmEvent->setwifiScanOptions(true);
-            if(wifi->wifiScanRequest(m_filterSsidslist.size() == 1 ? m_filterSsidslist[0] : ""))
+            if(wifi->wifiScanRequest(m_filterSsidslist))
                 rc = Core::ERROR_NONE;
             return rc;
         }

plugin/gnome/NetworkManagerGnomeWIFI.cpp

@@ -1685,7 +1685,7 @@ namespace WPEFramework
             g_main_loop_quit(_wifiManager->m_loop);
         }
 
-        bool wifiManager::wifiScanRequest(std::string ssidReq)
+        bool wifiManager::wifiScanRequest(const std::vector<std::string>& ssidsToFilter)
         {
             if(!createClientNewConnection())
                 return false;
@@ -1696,23 +1696,25 @@ namespace WPEFramework
                 return false;
             }
             m_isSuccess = false;
-            if(!ssidReq.empty())
+            if(!ssidsToFilter.empty())
             {
-                NMLOG_INFO("starting wifi scanning .. %s", ssidReq.c_str());
+                NMLOG_INFO("Starting wifi scanning for %d SSIDs:",static_cast<int>(ssidsToFilter.size()));
                 GVariantBuilder builder, array_builder;
                 GVariant *options;
                 g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
                 g_variant_builder_init(&array_builder, G_VARIANT_TYPE("aay"));
-                g_variant_builder_add(&array_builder, "@ay",
-                                    g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, (const guint8 *) ssidReq.c_str(), ssidReq.length(), 1)
-                                    );
+                for (const auto& ssid : ssidsToFilter) {
+                    g_variant_builder_add(&array_builder, "@ay",
+                                        g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, (const guint8 *) ssid.c_str(), ssid.length(), 1)
+                                        );
+                }
                 g_variant_builder_add(&builder, "{sv}", "ssids", g_variant_builder_end(&array_builder));
                 options = g_variant_builder_end(&builder);
                 nm_device_wifi_request_scan_options_async(wifiDevice, options, m_cancellable, wifiScanCb, this);
                 g_variant_unref(options); // Unreference the GVariant after passing it to the async function
             }
             else {
-                NMLOG_INFO("staring normal wifi scanning ..");
+                NMLOG_INFO("Starting normal wifi scanning ..");
                 nm_device_wifi_request_scan_async(wifiDevice, m_cancellable, wifiScanCb, this);
             }
             wait(m_loop);

plugin/gnome/NetworkManagerGnomeWIFI.h

@@ -31,6 +31,7 @@
 #include <string.h>
 #include <atomic>
 #include <mutex>
+#include <vector>
 
 #define WPS_RETRY_WAIT_IN_MS        10 // 10 sec
 #define WPS_RETRY_COUNT             10
@@ -54,7 +55,7 @@ namespace WPEFramework
             bool activateKnownConnection(std::string iface, std::string knowConnectionID="");
             bool wifiConnectedSSIDInfo(Exchange::INetworkManager::WiFiSSIDInfo &ssidinfo);
             bool wifiConnect(const Exchange::INetworkManager::WiFiConnectTo &ssidInfo);
-            bool wifiScanRequest(std::string ssidReq = "");
+            bool wifiScanRequest(const std::vector<std::string>& ssidsToFilter = {});
             bool isWifiScannedRecently(int timelimitInSec = 5); // default 5 sec as shotest scanning interval
             bool getKnownSSIDs(std::list<string>& ssids);
             bool addToKnownSSIDs(const Exchange::INetworkManager::WiFiConnectTo &ssidinfo);

tools/plugincli/NetworkManagerLibnmTest.cpp

@@ -220,7 +220,8 @@ int main()
 
                 NMLOG_INFO("Sending WiFi scan request%s", ssid.empty() ? " (all SSIDs)" : (" for SSID: " + ssid).c_str());
 
-                if (wifiMgr->wifiScanRequest(ssid)) {
+                bool scanRequestSent = ssid.empty() ? wifiMgr->wifiScanRequest() : wifiMgr->wifiScanRequest({ssid});
+                if (scanRequestSent) {
                     NMLOG_INFO("WiFi scan request sent successfully.");
                 } else {
                     NMLOG_ERROR("Failed to send WiFi scan request.");