Skip to content

RDK-60308-[tr69hostif, RFC] RDK Coverity Defect Resolution for Device Management #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vismalskumar0 wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

RDK-60308-[tr69hostif, RFC] RDK Coverity Defect Resolution for Device Management #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
731d67a
Check return value of pthread_cond_timedwait for ETIMEDOUT instead
Vismalskumar0 Jan 14, 2026
2971587
Merge pull request #339 from rdkcentral/develop
Vismalskumar0 Jan 22, 2026
503c67b
Update hostIf_IPClient_ReqHandler.cpp
Vismalskumar0 Jan 22, 2026
8b76f9f
Apply suggestion from @Copilot
Vismalskumar0 Jan 22, 2026
00502d4
Update Device_DeviceInfo.cpp
Vismalskumar0 Jan 22, 2026
3ac73d2
Apply suggestion from @Copilot
Vismalskumar0 Jan 22, 2026
68ce168
Update Device_DeviceInfo.cpp
Vismalskumar0 Jan 22, 2026
05db83b
Update tr69hostif_webpa.py
Vismalskumar0 Jan 22, 2026
64cf58e
Update src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp
Vismalskumar0 Jan 22, 2026
1ac5be4
Update src/hostif/handlers/src/hostIf_DeviceClient_ReqHandler.cpp
Vismalskumar0 Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/hostif/handlers/src/hostIf_DeviceClient_ReqHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,17 +795,26 @@ int DeviceClientReqHandler::handleSetAttributesMsg(HOSTIF_MsgData_t *stMsgData)
if(rc!=EOK)
{
ERR_CHK(rc);
// On strcpy_s failure, do not insert into the hash table; free allocated memory.
free(notifyKey);
free(notifyValuePtr);
ret = NOK;
}
else
{
g_hash_table_insert(notifyhash,notifyKey,notifyValuePtr);
ret = OK;
// Note: notifyKey and notifyValuePtr are now owned by the hash table, don't free them
}
g_hash_table_insert(notifyhash,notifyKey,notifyValuePtr);
ret = OK;
}
else
{
ret = NOK;
RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%s:%d] Not able to allocate Notify pointer %s\n", __FUNCTION__, __FILE__, __LINE__, stMsgData->paramName);
// Free only if allocation failed and not inserted into hash table
if(notifyKey) free(notifyKey);
if(notifyValuePtr) free(notifyValuePtr);
}
free(notifyKey);//CID:86943 - Resource leak
free(notifyValuePtr);
}
else
{
Expand Down
6 changes: 4 additions & 2 deletions src/hostif/handlers/src/hostIf_EthernetClient_ReqHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,14 +384,16 @@ int EthernetClientReqHandler::handleSetAttributesMsg(HOSTIF_MsgData_t *stMsgData
}
g_hash_table_insert(notifyhash,notifyKey,notifyValuePtr);
ret = OK;
// Note: notifyKey and notifyValuePtr are now owned by the hash table, don't free them
}
else
{
ret = NOK;
RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%s:%d] EthernetClientReqHandler Not able to allocate Notify pointer %s\n", __FUNCTION__, __FILE__, __LINE__, stMsgData->paramName);
// Free only if allocation failed and not inserted into hash table
if(notifyKey) free(notifyKey);
if(notifyValuePtr) free(notifyValuePtr);
}
free(notifyKey); //CID:87027 - Resource leak
free(notifyValuePtr);
}
else
{
Expand Down
20 changes: 13 additions & 7 deletions src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:

Check failure on line 4 in src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp' (Match: rdk/components/generic/tr69hostif/rdk/components/generic/tr69hostif/86d2141, 1180 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/tr69hostif/+archive/86d21415ae132c503c5c4feadef61dbb7f21ba0b.tar.gz, file: src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp)

Check failure on line 4 in src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp' (Match: rdk/components/generic/tr69hostif/rdk/components/generic/tr69hostif/1907, 1180 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/tr69hostif/+archive/rdk-dev-1907.tar.gz, file: src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -408,14 +408,16 @@
}
g_hash_table_insert(notifyhash,notifyKey,notifyValuePtr);
ret = OK;
// Note: notifyKey and notifyValuePtr are now owned by the hash table, don't free them
}
else
{
ret = NOK;
RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%s:%d] EthernetClientReqHandler Not able to allocate Notify pointer %s\n", __FUNCTION__, __FILE__, __LINE__, stMsgData->paramName);
// Free only if allocation failed and not inserted into hash table
if(notifyKey) free(notifyKey);
if(notifyValuePtr) free(notifyValuePtr);
}
free(notifyKey); //CID:85281 - Resource leak
free(notifyValuePtr);
}
else
{
Expand Down Expand Up @@ -459,6 +461,7 @@

void IPClientReqHandler::checkForUpdates()
{
std::lock_guard<std::mutex> lg(m_mutex);
if (mUpdateCallback == 0)
return;

Expand Down Expand Up @@ -487,11 +490,14 @@
{

if (ifindexes[i] > 0 && ifindexes[i] < sizeof(curNumOfInterfaceIPv4Addresses)/sizeof(curNumOfInterfaceIPv4Addresses[0])) {
int ipv4AddressNumberOfEntries = hostIf_IPInterface::getInstance (ifindexes[i])->getIPv4AddressNumberOfEntries ();
RDK_LOG (RDK_LOG_DEBUG, LOG_TR69HOSTIF, "[%s:%s:%d] ipv4AddressNumberOfEntries = %d, curNumOfInterfaceIPv4Addresses[%d] = %d\n",
__FILE__, __FUNCTION__, __LINE__, ipv4AddressNumberOfEntries, ifindexes[i], curNumOfInterfaceIPv4Addresses[ifindexes[i]]);
sprintf (objectPath, "Device.IP.Interface.%d.IPv4Address.", ifindexes[i]);
sendAddRemoveEvents (mUpdateCallback, ipv4AddressNumberOfEntries, curNumOfInterfaceIPv4Addresses[ifindexes[i]], objectPath);
hostIf_IPInterface* ipIfInst = hostIf_IPInterface::getInstance(ifindexes[i]);
if (ipIfInst) {
int ipv4AddressNumberOfEntries = ipIfInst->getIPv4AddressNumberOfEntries();
RDK_LOG (RDK_LOG_DEBUG, LOG_TR69HOSTIF, "[%s:%s:%d] ipv4AddressNumberOfEntries = %d, curNumOfInterfaceIPv4Addresses[%d] = %d\n",
__FILE__, __FUNCTION__, __LINE__, ipv4AddressNumberOfEntries, ifindexes[i], curNumOfInterfaceIPv4Addresses[ifindexes[i]]);
sprintf (objectPath, "Device.IP.Interface.%d.IPv4Address.", ifindexes[i]);
sendAddRemoveEvents (mUpdateCallback, ipv4AddressNumberOfEntries, curNumOfInterfaceIPv4Addresses[ifindexes[i]], objectPath);
}
Comment on lines +493 to +500
Copy link

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The null check is only added for the IPv4 case but not for the IPv6 case. Lines 503 and 509 still call hostIf_IPInterface::getInstance(ifindexes[i]) without checking if the returned pointer is null before calling methods on it. This creates an inconsistency where the IPv4 code path is protected but the IPv6 code path is not.

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Contributor Author

@Vismalskumar0 Vismalskumar0 Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot open a new pull request to apply changes based on this feedback

Comment on lines +493 to +500
Copy link

Copilot AI Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The null check for ipIfInst is added here, but the same pattern is used in the IPv6 code path (lines 504, 510) without null checks. Consider adding the same null check for consistency and safety in the IPv6 sections.

Copilot uses AI. Check for mistakes.

#ifdef IPV6_SUPPORT
if (ifindexes[i] < sizeof(curNumOfInterfaceIPv6Addresses)/sizeof(curNumOfInterfaceIPv6Addresses[0])) {
Expand Down
12 changes: 8 additions & 4 deletions src/hostif/handlers/src/hostIf_TimeClient_ReqHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,16 @@ int TimeClientReqHandler::handleGetAttributesMsg(HOSTIF_MsgData_t *stMsgData)
}
g_hash_table_insert(notifyhash,notifyKey,notifyValuePtr);
ret = OK;
// Note: notifyKey and notifyValuePtr are now owned by the hash table, don't free them
}
else
{
ret = NOK;
RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%s:%d] Not able to allocate Notify pointer %s\n", __FUNCTION__, __FILE__, __LINE__, stMsgData->paramName);
// Free only if allocation failed and not inserted into hash table
if(notifyKey) free(notifyKey);
if(notifyValuePtr) free(notifyValuePtr);
}
free(notifyKey); //CID:88420 - Resource leak
free(notifyValuePtr);
}
else
{
Expand Down Expand Up @@ -341,14 +343,16 @@ int TimeClientReqHandler::handleSetAttributesMsg(HOSTIF_MsgData_t *stMsgData)
}
g_hash_table_insert(notifyhash,notifyKey,notifyValuePtr);
ret = OK;
// Note: notifyKey and notifyValuePtr are now owned by the hash table, don't free them
}
else
{
ret = NOK;
RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%s:%d] Not able to allocate Notify pointer %s\n", __FUNCTION__, __FILE__, __LINE__, stMsgData->paramName);
// Free only if allocation failed and not inserted into hash table
if(notifyKey) free(notifyKey);
if(notifyValuePtr) free(notifyValuePtr);
}
free(notifyKey); //CID:89484 - Resource leak
free(notifyValuePtr);
}
else
{
Expand Down
3 changes: 3 additions & 0 deletions src/hostif/handlers/src/hostIf_XrdkCentralT2_ReqHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ int XRdkCentralT2::handleGetMsg(HOSTIF_MsgData_t *stMsgData)
stMsgData->paramValueLong = (char*) malloc (iParamLen+1);
if (NULL == stMsgData->paramValueLong) {
RDK_LOG (RDK_LOG_ERROR, LOG_TR69HOSTIF, "[%s] [%d] memory allocation failed.\n", __FUNCTION__, __LINE__);
free(paramValue);
ret = NOK;
return ret;
}
Expand All @@ -176,6 +177,7 @@ int XRdkCentralT2::handleGetMsg(HOSTIF_MsgData_t *stMsgData)
strncpy(stMsgData->paramValue, paramValue, TR69HOSTIFMGR_MAX_PARAM_LEN-1);
stMsgData->paramValue[TR69HOSTIFMGR_MAX_PARAM_LEN-1] = '\0';
}
free(paramValue);
ret = OK ;
}

Expand All @@ -186,6 +188,7 @@ int XRdkCentralT2::handleGetMsg(HOSTIF_MsgData_t *stMsgData)
if(OK == getRbusStringParam("Device.X_RDKCENTRAL-COM_T2.ReportProfilesMsgPack", &paramValue)) {
strncpy(stMsgData->paramValue, paramValue, TR69HOSTIFMGR_MAX_PARAM_LEN-1);
stMsgData->paramValue[TR69HOSTIFMGR_MAX_PARAM_LEN-1] = '\0';
free(paramValue);
ret = OK ;
}

Expand Down
5 changes: 1 addition & 4 deletions src/hostif/handlers/src/hostIf_msgHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,7 @@ void hostIf_Init_Dummy_stMsgData (HOSTIF_MsgData_t **stMsgData)
{
stMsgDummyData = new HOSTIF_MsgData_t();
rc=strcpy_s(stMsgDummyData->paramName,sizeof(stMsgDummyData->paramName), TEST_STR);
if(rc!=EOK)
{
ERR_CHK(rc);
}
ERR_CHK(rc);
stMsgDummyData->reqType = HOSTIF_GET;
stMsgDummyData->instanceNum = 0;
*stMsgData = stMsgDummyData;
Expand Down
9 changes: 7 additions & 2 deletions src/hostif/parodusClient/pal/libpd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,14 @@ static void parodus_receive_wait()
clock_gettime(CLOCK_MONOTONIC, &currTime);
currTime.tv_sec += 5;
pthread_mutex_lock(&parodus_lock);
if(0 != pthread_cond_timedwait(&parodus_cond, &parodus_lock,&currTime ))
int wait_ret = pthread_cond_timedwait(&parodus_cond, &parodus_lock,&currTime);
if(wait_ret == ETIMEDOUT)
{
RDK_LOG(RDK_LOG_DEBUG,LOG_PARODUS_IF,"parodus_receive_wait(): wait for key acquisition timed out"); //CID:119759 - checked return
RDK_LOG(RDK_LOG_DEBUG,LOG_PARODUS_IF,"parodus_receive_wait(): wait for key acquisition timed out");
}
else if(wait_ret != 0)
{
RDK_LOG(RDK_LOG_ERROR,LOG_PARODUS_IF,"parodus_receive_wait(): pthread_cond_timedwait failed with error %d", wait_ret);
}
RDK_LOG(RDK_LOG_INFO,LOG_PARODUS_IF,"[%s:%d] Unlocking mutex... \n", __FUNCTION__, __LINE__);
pthread_mutex_unlock(&parodus_lock);
Expand Down
3 changes: 2 additions & 1 deletion src/hostif/parodusClient/pal/webpa_adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:

Check failure on line 3 in src/hostif/parodusClient/pal/webpa_adapter.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'src/hostif/parodusClient/pal/webpa_adapter.cpp' (Match: rdk/components/generic/tr69hostif/rdk/components/generic/tr69hostif/1905, 500 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/tr69hostif/+archive/rdk-dev-1905.tar.gz, file: src/hostif/parodusClient/pal/webpa_adapter.cpp)

Check failure on line 3 in src/hostif/parodusClient/pal/webpa_adapter.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'src/hostif/parodusClient/pal/webpa_adapter.cpp' (Match: rdk/components/generic/tr69hostif/rdk/components/generic/tr69hostif/1909, 500 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/tr69hostif/+archive/rdk-dev-1909.tar.gz, file: src/hostif/parodusClient/pal/webpa_adapter.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -113,7 +113,8 @@
char **notifyparameters=NULL;
int notifyListSize =0;

// Read Notify configuration file
// TODO: Read Notify configuration file and populate notifyparameters
// Currently this functionality is not implemented
if(notifyparameters != NULL)
{
WDMP_STATUS *ret = NULL;
Expand Down
13 changes: 10 additions & 3 deletions src/hostif/parodusClient/pal/webpa_attribute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:

Check failure on line 3 in src/hostif/parodusClient/pal/webpa_attribute.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'src/hostif/parodusClient/pal/webpa_attribute.cpp' (Match: rdk/components/generic/tr69hostif/rdk/components/generic/tr69hostif/86d2141, 217 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/tr69hostif/+archive/86d21415ae132c503c5c4feadef61dbb7f21ba0b.tar.gz, file: src/hostif/parodusClient/pal/webpa_attribute.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -155,9 +155,16 @@
strncpy(Param.paramName,pParameterName,strlen(pParameterName)+1);
Param.instanceNum = 0;
Param.paramtype = hostIf_IntegerType;
get_AttribValues_tr69hostIf(&Param);
strncpy(attr[0][i]->value,Param.paramValue, strlen(Param.paramValue));
attr[0][i]->value[strlen(Param.paramValue)] = '\0';
int ret = get_AttribValues_tr69hostIf(&Param);
if(ret == 0 && Param.paramValue != NULL)
Copy link
Copy Markdown
Contributor

@rdkcmf-jenkins rdkcmf-jenkins Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverity Issue - Array compared against 0

Comparing an array to null is not useful: "Param.paramValue != NULL", since the test will always evaluate as true.

Medium Impact, CWE-398
NO_EFFECT

How to fix

Was "Param.paramValue" formerly declared as a pointer?

Copy link

Copilot AI Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The null check Param.paramValue != NULL is incorrect. The paramValue field is a fixed-size char array in the HOSTIF_MsgData_t structure (line 171 of hostIf_tr69ReqHandler.h), not a pointer, so it can never be NULL. This check will always evaluate to true. Consider checking if the string is empty using Param.paramValue[0] != '\0' instead, or relying solely on the return value check.

Suggested change
if(ret == 0 && Param.paramValue != NULL)
if(ret == 0 && Param.paramValue[0] != '\0')

Copilot uses AI. Check for mistakes.
{
strncpy(attr[0][i]->value,Param.paramValue, strlen(Param.paramValue));
attr[0][i]->value[strlen(Param.paramValue)] = '\0';
}
else
{
attr[0][i]->value[0] = '\0';
}
attr[0][i]->type = WAL_INT; // Currently only notification which is a int
}
return WAL_SUCCESS;
Expand Down
4 changes: 3 additions & 1 deletion src/hostif/parodusClient/pal/webpa_parameter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,9 @@ static WAL_STATUS rbusSetParamInfo(ParamVal paramVal, char * transactionID)
rbusValue_Init(&setVal);
if (rbusValue_SetFromString(setVal, type, paramVal.value))
{
rbusSetOptions_t opts = {true, strtoul (transactionID, NULL, 0)};
rbusSetOptions_t opts;
opts.commit = true;
opts.sessionId = (uint32_t)strtoul(transactionID, NULL, 0);
rc = rbus_set(g_busHandle, paramVal.name, setVal, &opts);
if(rc != RBUS_ERROR_SUCCESS)
{
Expand Down
48 changes: 13 additions & 35 deletions src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:

Check failure on line 3 in src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp' (Match: rdk/components/generic/tr69hostif/rdk/components/generic/tr69hostif/2009, 5589 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/tr69hostif/+archive/rdk-dev-2009.tar.gz, file: src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp)

Check failure on line 3 in src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp' (Match: rdk/components/generic/tr69hostif/rdk/components/generic/tr69hostif/2012, 5589 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/tr69hostif/+archive/rdk-dev-2012.tar.gz, file: src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp)

Check failure on line 3 in src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp' (Match: rdk/components/generic/tr69hostif/rdk/components/generic/tr69hostif/2101, 5589 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/tr69hostif/+archive/rdk-dev-2101.tar.gz, file: src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp)
*
* Copyright 2016-2019 RDK Management
*
Expand Down Expand Up @@ -2932,12 +2932,7 @@
RDK_LOG(RDK_LOG_DEBUG,LOG_TR69HOSTIF,"[%s] File not exists, IpRemoteInterface file open failed \n", __FUNCTION__);

//values not populated so unknown.
rc=strcpy_s(ipAddress,sizeof(ipAddress),"unknown");
if(rc!=EOK)
{
ERR_CHK(rc);
}
snprintf((char *)stMsgData->paramValue, sizeof(stMsgData->paramValue), "%s",ipAddress);
snprintf((char *)stMsgData->paramValue, sizeof(stMsgData->paramValue), "unknown");
}

stMsgData->paramtype = hostIf_StringType;
Expand Down Expand Up @@ -2985,12 +2980,7 @@
RDK_LOG(RDK_LOG_DEBUG,LOG_TR69HOSTIF,"[%s] File not exists, IpRemoteInterface file open failed \n", __FUNCTION__);

//values not populated so unknown.
rc=strcpy_s(macAddress,sizeof(macAddress),"unknown");
if(rc!=EOK)
{
ERR_CHK(rc);
}
snprintf((char *)stMsgData->paramValue, sizeof(stMsgData->paramValue), "%s",macAddress);
snprintf((char *)stMsgData->paramValue, sizeof(stMsgData->paramValue), "unknown");
}

stMsgData->paramtype = hostIf_StringType;
Expand Down Expand Up @@ -3189,7 +3179,7 @@
RDK_LOG (RDK_LOG_INFO, LOG_TR69HOSTIF, "%s: call curl to get Components that are Ready..\n", __FUNCTION__);

postData = "{\"jsonrpc\":\"2.0\",\"id\":\"3\",\"method\": \"org.rdk.MigrationPreparer.getComponentReadiness\" }";
response = getJsonRPCData(postData);
response = getJsonRPCData(postData);

if(response.c_str())
{
Expand Down Expand Up @@ -3482,19 +3472,12 @@
if (get_boolean(stMsgData->paramValue))
{
rc=strcpy_s(ForwardSSH,sizeof(ForwardSSH),"true");
if(rc!=EOK)
{
ERR_CHK(rc);

}
ERR_CHK(rc);
}
else
{
rc=strcpy_s(ForwardSSH,sizeof(ForwardSSH),"false");
if(rc!=EOK)
{
ERR_CHK(rc);
}
ERR_CHK(rc);
}
fprintf(fp,"ForwardSSH=%s", ForwardSSH);
}
Expand Down Expand Up @@ -4815,6 +4798,10 @@
v_secure_pclose(pipe2);
fclose(fp2);
}
else {
if (pipe2) v_secure_pclose(pipe2);
if (fp2) fclose(fp2);
}
RDK_LOG(RDK_LOG_INFO, LOG_TR69HOSTIF, "[%s:%d] Successfully executed RFC Manager\n", __FUNCTION__, __LINE__);
}

Expand Down Expand Up @@ -5032,7 +5019,7 @@
RDK_LOG (RDK_LOG_ERROR, LOG_TR69HOSTIF, "[%s] Failed to trigger Download, \'system (\"%s\")\' returned error code '%d'\n", __FUNCTION__, cmd, ret);
return NOK;
}
RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF, "[%s:%d] Yw.. Successfully executed (\'%s\')Triggered Download.\n",__FUNCTION__,__LINE__, cmd);
RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF, "[%s:%d] Successfully executed (\'%s\')Triggered Download.\n",__FUNCTION__,__LINE__, cmd);

/*Reset all cache parameter values for download trigger on successfully executed*/
m_xFirmwareDownloadProtocol.clear();
Expand Down Expand Up @@ -5324,10 +5311,7 @@

HOSTIF_MsgData_t stRfcData = {0};
rc=strcpy_s(stRfcData.paramName,sizeof(stRfcData.paramName), X_RDK_RFC_MANGEBLENOTIFICATION_ENABLE);
if(rc!=EOK)
{
ERR_CHK(rc);
}
ERR_CHK(rc);
if((get_xRDKCentralComRFC(&stRfcData) == OK) && (strncmp(stRfcData.paramValue, "true", sizeof("true")) == 0))
{
m_strXOpsDevManageableNotification = stMsgData->paramValue;
Expand All @@ -5351,10 +5335,7 @@
/* Check for RFC */
HOSTIF_MsgData_t stRfcData = {0};
rc=strcpy_s(stRfcData.paramName,sizeof(stRfcData.paramName), X_RDK_RFC_MANGEBLENOTIFICATION_ENABLE);
if(rc!=EOK)
{
ERR_CHK(rc);
}
ERR_CHK(rc);
if((get_xRDKCentralComRFC(&stRfcData) == OK) && (strncmp(stRfcData.paramValue, "true", sizeof("true")) == 0))
{
m_strXOpsRPCFwDwldStartedNotification = stMsgData->paramValue;
Expand All @@ -5375,10 +5356,7 @@
/* Check for RFC */
HOSTIF_MsgData_t stRfcData = {0};
rc=strcpy_s(stRfcData.paramName,sizeof(stRfcData.paramName), X_RDK_RFC_MANGEBLENOTIFICATION_ENABLE);
if(rc!=EOK)
{
ERR_CHK(rc);
}
ERR_CHK(rc);
if((get_xRDKCentralComRFC(&stRfcData) == OK) && (strncmp(stRfcData.paramValue, "true", sizeof("true")) == 0))
{
m_bXOpsRPCFwDwldCompletedNotification = get_boolean(stMsgData->paramValue);
Expand Down
Loading
Loading