code review comments updated

rdkcentral · Jan 12, 2025 · 0a72dc4 · 0a72dc4
1 parent c2934f7
commit 0a72dc4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/NetworkManagerConnectivity.cpp b/NetworkManagerConnectivity.cpp
@@ -606,9 +606,9 @@ namespace WPEFramework
                     m_notify = true;
                 InitialRetryCount = 1;
             }
-            // Initial case monitoring
-            else if (m_switchToInitial) {
-                NMLOG_INFO("Initial cm check - retry count %d - %s", InitialRetryCount, getInternetStateString(m_InternetState));
+            else if (m_switchToInitial)
+            {
+                NMLOG_INFO("Initial cm check - retry count %d - %s", InitialRetryCount, getInternetStateString(currentInternetState));
                 timeoutInSec = NMCONNECTIVITY_MONITOR_MIN_INTERVAL;
 
                 // Lambda functions to check connectivity for IPv4 and IPv6
@@ -736,6 +736,7 @@ namespace WPEFramework
                     }
                 } else { // ideal case no change in network state
                     IdealRetryCount = 0;
+                    m_InternetState = currentInternetState;
                 }
             }
 

diff --git a/NetworkManagerGnomeProxy.cpp b/NetworkManagerGnomeProxy.cpp
@@ -51,8 +51,6 @@ namespace WPEFramework
             nmEvent = GnomeNetworkManagerEvents::getInstance();
             nmEvent->startNetworkMangerEventMonitor();
             wifi = wifiManager::getInstance();
-            /* start connectivity monitor */
-            connectivityMonitor.startConnectivityMonitor();
             return;
         }
 

diff --git a/NetworkManagerImplementation.cpp b/NetworkManagerImplementation.cpp
@@ -58,9 +58,6 @@ namespace WPEFramework
             {
                 m_registrationThread.join();
             }
-
-            /* stoping connectivity monitor */
-            connectivityMonitor.stopConnectivityMonitor();
         }
 
         /**
@@ -250,17 +247,17 @@ namespace WPEFramework
          uint32_t NetworkManagerImplementation::IsConnectedToInternet(string &ipversion /* @inout */, InternetStatus &result /* @out */)
         {
             LOG_ENTRY_FUNCTION();
-            Exchange::INetworkManager::IPVersion ipVersion = Exchange::INetworkManager::IP_ADDRESS_V4;
+            Exchange::INetworkManager::IPVersion curlIPversion = Exchange::INetworkManager::IP_ADDRESS_V4;
             bool ipVersionNotSpecified = false;
             if(0 == strcasecmp("IPv4", ipversion.c_str()))
-                ipVersion = Exchange::INetworkManager::IP_ADDRESS_V4;
+                curlIPversion = Exchange::INetworkManager::IP_ADDRESS_V4;
             else if(0 == strcasecmp("IPv6", ipversion.c_str()))
-                ipVersion = Exchange::INetworkManager::IP_ADDRESS_V6;
+                curlIPversion = Exchange::INetworkManager::IP_ADDRESS_V6;
             else
                 ipVersionNotSpecified = true;
 
-            result = connectivityMonitor.getInternetState(ipVersion, ipVersionNotSpecified);
-            if (Exchange::INetworkManager::IP_ADDRESS_V6 == ipVersion)
+            result = connectivityMonitor.getInternetState(curlIPversion, ipVersionNotSpecified);
+            if (Exchange::INetworkManager::IP_ADDRESS_V6 == curlIPversion)
                 ipversion = "IPv6";
             else
                 ipversion = "IPv4";

diff --git a/NetworkManagerRDKProxy.cpp b/NetworkManagerRDKProxy.cpp
@@ -671,8 +671,6 @@ namespace WPEFramework
                 */
                 getInitialConnectionState();
             }
-
-            connectivityMonitor.startConnectivityMonitor();
         }
 
         uint32_t NetworkManagerImplementation::GetAvailableInterfaces (Exchange::INetworkManager::IInterfaceDetailsIterator*& interfacesItr/* @out */)
-Original file line number
+Diff line change
@@ Expand Up / @@ -671,8 +671,6 @@ namespace WPEFramework @@
                     */
                     getInitialConnectionState();
                 }
-                connectivityMonitor.startConnectivityMonitor();
             }
             uint32_t NetworkManagerImplementation::GetAvailableInterfaces (Exchange::INetworkManager::IInterfaceDetailsIterator*& interfacesItr/* @out */)
@@ Expand Down @@