Update requied changes for SSID & frequency filltering

rdkcentral · Nov 13, 2024 · 8ae3425 · 8ae3425
1 parent b231883
commit 8ae3425
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/NetworkManagerGnomeProxy.cpp b/NetworkManagerGnomeProxy.cpp
@@ -555,7 +555,7 @@ namespace WPEFramework
                 string tmpssidlist{};
                 while (ssids->Next(tmpssidlist) == true)
                 {
-                    scanForSsidslist.push_back(tmpssidlist);
+                    scanForSsidslist.push_back(tmpssidlist.c_str());
                 }
             }
 

diff --git a/NetworkManagerImplementation.cpp b/NetworkManagerImplementation.cpp
@@ -492,10 +492,9 @@ namespace WPEFramework
         void NetworkManagerImplementation::filterScanResults(JsonArray &ssids)
         {
             JsonArray result;
-	    if (scanForSsidslist)
-                std::unordered_set<std::string> scanForSsidsSet(scanForSsidslist.begin(), scanForSsidslist.end());
+            std::unordered_set<std::string> scanForSsidsSet(scanForSsidslist.begin(), scanForSsidslist.end());
 
-            if ((scanForSsidslist && !scanForSsidslist->empty()) || (scanForFreq && !scanForFreq->empty())) {
+            if (!scanForSsidslist.empty() && !scanForFreq.empty())
             {
                 for (int i = 0; i < ssids.Length(); i++)
                 {

diff --git a/NetworkManagerJsonRpc.cpp b/NetworkManagerJsonRpc.cpp
@@ -670,32 +670,35 @@ namespace WPEFramework
         {
             LOG_INPARAM();
             uint32_t rc = Core::ERROR_GENERAL;
+	    string frequency{};
+	    Exchange::INetworkManager::IStringIterator* ssids = NULL;
 
 	    if (parameters.HasLabel("frequency"))
-                string frequency = parameters["frequency"].String();
+	    {
+                frequency = parameters["frequency"].String();
+                NMLOG_INFO("Received frequency string : %s", frequency.c_str());
+	    }
 
 	    if (parameters.HasLabel("ssid"))
+	    {
                 JsonArray array = parameters["ssid"].Array();
+                std::vector<std::string> tmpssidslist;
+	        JsonArray::Iterator index(array.Elements());
 
-	    Exchange::INetworkManager::IStringIterator* ssids = NULL;
-	    std::vector<std::string> tmpssidslist;
-
-	    JsonArray::Iterator index(array.Elements());
-            while (index.Next() == true)
-            {
-                if (Core::JSON::Variant::type::STRING == index.Current().Content())
-                {
-                    tmpssidslist.push_back(index.Current().String().c_str());
-                }
-                else
+		while (index.Next() == true)
                 {
-                    NMLOG_DEBUG("Unexpected variant type");
-                    returnJson(rc);
+                    if (Core::JSON::Variant::type::STRING == index.Current().Content())
+                    {
+                        tmpssidslist.push_back(index.Current().String().c_str());
+                    }
+                    else
+                    {
+                        NMLOG_DEBUG("Unexpected variant type");
+                        returnJson(rc);
+                    }
                 }
-            }
-            ssids = (Core::Service<RPC::StringIterator>::Create<RPC::IStringIterator>(tmpssidslist));
-
-            NMLOG_INFO("Received frequency string : %s", frequency.c_str());
+                ssids = (Core::Service<RPC::StringIterator>::Create<RPC::IStringIterator>(tmpssidslist));
+	    }
 
             if (_networkManager)
                 rc = _networkManager->StartWiFiScan(frequency, ssids);

diff --git a/NetworkManagerRDKProxy.cpp b/NetworkManagerRDKProxy.cpp
@@ -1030,7 +1030,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
                 string tmpssidlist{};
                 while (ssids->Next(tmpssidlist) == true)
                 {
-                    scanForSsidslist.push_back(tmpssidlist);
+                    scanForSsidslist.push_back(tmpssidlist.c_str());
 		    NMLOG_INFO("SSID added to scanForSsidslist: %s", tmpssidlist.c_str());
                 }
             }