From 31688ed584817550d6171f81ac819e70300e0078 Mon Sep 17 00:00:00 2001 From: Deepthi C Shetty Date: Thu, 20 Mar 2025 14:50:38 +0530 Subject: [PATCH] DELIA-67691: Supplementary profile fetch is failing because WebConfig URL is appending wrong mac Signed-off-by: Deepthi C Shetty --- src/rdkv/impl.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/rdkv/impl.c b/src/rdkv/impl.c index 99b9591..029a417 100644 --- a/src/rdkv/impl.c +++ b/src/rdkv/impl.c @@ -160,7 +160,7 @@ void macIDToLower(char macValue[],char macConverted[]) char* get_deviceMAC() { - if(strlen(deviceMAC) != 0) + if(strlen(deviceMAC) != 0 && strncmp(deviceMAC, "000000000000", 12) != 0) { WebcfgDebug("deviceMAC returned %s\n", deviceMAC); return deviceMAC; @@ -175,9 +175,10 @@ char* get_deviceMAC() macIDToLower(deviceMACValue, deviceMAC); WebcfgDebug("deviceMAC: %s\n",deviceMAC); CPEABS_FREE(macID); + return deviceMAC; } WebcfgDebug("deviceMAC returned from lib is %s\n", deviceMAC); - return deviceMAC; + return NULL; } char* get_deviceWanMAC() @@ -285,6 +286,8 @@ char * getParamValue(char *paramName) CPEABS_FREE(parametervalArr[0]->name); CPEABS_FREE(parametervalArr[0]->value); CPEABS_FREE(parametervalArr[0]); + CPEABS_FREE(parametervalArr); + return paramValue; } else { @@ -293,7 +296,7 @@ char * getParamValue(char *paramName) } CPEABS_FREE(parametervalArr); WebcfgDebug("getParamValue : paramValue is %s\n", paramValue); - return paramValue; + return NULL; } void writeToFile(char* pText) @@ -443,14 +446,6 @@ int Get_Webconfig_URL( char *pString) int Set_Webconfig_URL( char *pString) { snprintf(webCfgPersist.m_url, 1024, "%s", pString); - cJSON * pWebCfg = convertWebCfgDataToJson(); - if (pWebCfg) - { - char* pString = cJSON_Print(pWebCfg); - writeToFile(pString); - cJSON_Delete(pWebCfg); - } - return RETURN_OK; } @@ -471,13 +466,6 @@ int Set_Supplementary_URL( char *name, char *pString) { (void) name; snprintf(webCfgPersist.m_teleSuplUrl, 1024, "%s", pString); - cJSON * pWebCfg = convertWebCfgDataToJson(); - if (pWebCfg) - { - char* pString = cJSON_Print(pWebCfg); - writeToFile(pString); - cJSON_Delete(pWebCfg); - } return RETURN_OK; }