Merge pull request #289 from xmidt-org/revert-280-RDKBDEV-2936

Revert "RDKBDEV-2936: drop syscfg_init() as a public API"
xmidt-org · Dec 20, 2024 · ba76ce8 · ba76ce8
2 parents f371eca + 4c7b58c
commit ba76ce8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/source/broadband/webpa_internal.c b/source/broadband/webpa_internal.c
@@ -20,9 +20,6 @@
 #endif
 
 #include <cJSON.h>
-#ifdef RDKB_BUILD
-#include <syscfg/syscfg.h>
-#endif
 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
 /*----------------------------------------------------------------------------*/
@@ -1434,12 +1431,15 @@ WDMP_STATUS check_ethernet_wan_status()
     char *status = NULL;
     char isEthEnabled[64]={'\0'};
 #ifdef RDKB_BUILD
-    if( 0 == syscfg_get( NULL, "eth_wan_enabled", isEthEnabled, sizeof(isEthEnabled)) && (isEthEnabled[0] != '\0' && strncmp(isEthEnabled, "true", strlen("true")) == 0))
+    if(0 == syscfg_init())
     {
-        WalInfo("Ethernet WAN is enabled\n");
-        OnboardLog("Ethernet WAN is enabled\n");
-        eth_wan_status = TRUE;
-        return WDMP_SUCCESS;
+        if( 0 == syscfg_get( NULL, "eth_wan_enabled", isEthEnabled, sizeof(isEthEnabled)) && (isEthEnabled[0] != '\0' && strncmp(isEthEnabled, "true", strlen("true")) == 0))
+        {
+            WalInfo("Ethernet WAN is enabled\n");
+            OnboardLog("Ethernet WAN is enabled\n");
+            eth_wan_status = TRUE;
+            return WDMP_SUCCESS;
+        }
     }
     else
 #endif

diff --git a/source/broadband/webpa_notification.c b/source/broadband/webpa_notification.c
@@ -587,9 +587,14 @@ static void getNotifyParamList(const char ***paramList, int *size)
     	    }
 	    char meshEnable[64];
 	    memset(meshEnable, 0, sizeof(meshEnable));
-	    if(syscfg_get( NULL, "mesh_enable", meshEnable, sizeof(meshEnable))!=0)
-	        WalError("syscfg_get failed\n"); 
-
+	    if(0 == syscfg_init())
+	    {
+		    syscfg_get( NULL, "mesh_enable", meshEnable, sizeof(meshEnable));
+	    }
+	    else
+	    {
+		    WalError("syscfg_init failed\n");
+	    }
 	    if(meshEnable[0] != '\0' && strncmp(meshEnable, "true", strlen("true")) == 0)
 	    {
 		    WalInfo("Mesh/plume is enabled\n");