RDKTV-25836 : Removed redundant connectivity check cal (rdkcentral#4585)

* RDKTV-25836 : Removed redundant connectivity check cal
RDKDoc · Oct 27, 2023 · b114535 · b114535
1 parent fac2272
commit b114535
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/Network/CHANGELOG.md b/Network/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [1.2.3] - 2023-10-23
+### Fixed
+- Fixed the isConnectedToInternet method to not to call getPublicIP; as they are independent RPCs.
+
 ## [1.2.2] - 2023-09-29
 ### Added
 - Implement Thunder Plugin Configuration for Kirkstone builds(CMake-3.20 & above)

diff --git a/Network/Network.cpp b/Network/Network.cpp
@@ -34,7 +34,7 @@ using namespace std;
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 2
-#define API_VERSION_NUMBER_PATCH 0
+#define API_VERSION_NUMBER_PATCH 3
 
 /* Netsrvmgr Based Macros & Structures */
 #define IARM_BUS_NM_SRV_MGR_NAME "NET_SRV_MGR"
@@ -1200,27 +1200,8 @@ typedef struct _IARM_BUS_NetSrvMgr_Iface_EventData_t {
                             const PluginHost::ISubSystem::IInternet* internet(subSystem->Get<PluginHost::ISubSystem::IInternet>());
                             if (nullptr == internet)
                             {
-                                if (m_ipversion.empty())
-                                {
-                                    JsonObject p, r;
-                                    getIPSettings(p, r);
-                                }
-
-                                if (m_publicIPAddress.empty())
-                                {
-                                    JsonObject p2, r2;
-                                    if (m_ipversion == "IPV6")
-                                        p2["ipv6"] = true;
-                                    getPublicIP(p2, r2);
-                                }
-
-                                if (!m_publicIPAddress.empty())
-                                {
-                                    subSystem->Set(PluginHost::ISubSystem::INTERNET, this);
-                                    LOGWARN("Set INTERNET ISubSystem");
-                                }
-                                else
-                                    LOGERR("Connected to Internet, but no publicIP");
+                                subSystem->Set(PluginHost::ISubSystem::INTERNET, this);
+                                LOGWARN("Set INTERNET ISubSystem");
                             }
 
                             subSystem->Release();
@@ -1263,7 +1244,7 @@ typedef struct _IARM_BUS_NetSrvMgr_Iface_EventData_t {
                 LOGWARN ("Network plugin not initialised yet returning from %s", __FUNCTION__);
             }
             returnResponse(result);
-        }
+        }   
 
         uint32_t Network::setConnectivityTestEndpoints (const JsonObject &parameters, JsonObject &response)
         {

diff --git a/docs/api/NetworkPlugin.md b/docs/api/NetworkPlugin.md
@@ -2,7 +2,7 @@
 <a name="NetworkPlugin"></a>
 # NetworkPlugin
 
-**Version: [1.2.2](https://github.com/rdkcentral/rdkservices/blob/main/Network/CHANGELOG.md)**
+**Version: [1.2.3](https://github.com/rdkcentral/rdkservices/blob/main/Network/CHANGELOG.md)**
 
 A org.rdk.Network plugin for Thunder framework.