Skip to content

LTE-2689:[WNC][XLE] remote device.1 capabilities are not shown along with Extender , Modem #8

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

Closed
biju-vi wants to merge 15 commits into from
Closed

LTE-2689:[WNC][XLE] remote device.1 capabilities are not shown along with Extender , Modem #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7cbd798
Fixing local capability override issue
biju-vi Dec 23, 2025
640fe3e
adding trace log when PSM get updated
biju-vi Dec 23, 2025
f9d2c4d
remove temporary buffer
biju-vi Dec 23, 2025
61cf729
adding new capabilities
biju-vi Dec 23, 2025
3fbe08c
fixing compilation issue
biju-vi Dec 23, 2025
c7c5e3e
LTE-2689 - remote device.1 capabilities are not shown along with Exte…
biju-vi Dec 23, 2025
4e0679d
LTE-2689 - remote device.1 capabilities are not shown along with Exte…
biju-vi Dec 23, 2025
cc81461
adding additional logs
biju-vi Dec 23, 2025
a3d33d6
adding logs
biju-vi Dec 23, 2025
b3d25cc
adding PSM check
biju-vi Dec 23, 2025
136130f
updating PSM
biju-vi Dec 23, 2025
cef7f56
LTE-2689:remote device.1 capabilities are not shown along with Extend…
biju-vi Dec 23, 2025
8622084
LTE-2689:remote device.1 capabilities are not shown along with Extend…
biju-vi Dec 23, 2025
6cf55c5
updating trace error with info
biju-vi Dec 23, 2025
06c9304
adding logs for incoming capability update
biju-vi Dec 23, 2025
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
4 changes: 4 additions & 0 deletions source/InterDeviceManager/Idm_data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ static int IdmMgr_get_IDM_ParametersFromPSM()

retPsmGet = IDM_RdkBus_GetParamValuesFromDB(param_name,param_value,sizeof(param_value));

CcspTraceInfo(("%s %d - Capabilities initial value from PSM %s \n", __FUNCTION__, __LINE__ , param_value));

if (retPsmGet == CCSP_SUCCESS)
{
AnscCopyString(pidmDmlInfo->stConnectionInfo.Capabilities, param_value);
Expand Down Expand Up @@ -124,6 +126,7 @@ int IdmMgr_write_IDM_ParametersToPSM()
_ansc_memset(param_value, 0, sizeof(param_value));
_ansc_sprintf(param_name, PSM_DEVICE_CAPABILITIES);
_ansc_sprintf(param_value, pidmDmlInfo->stConnectionInfo.Capabilities);
CcspTraceInfo(("%s %d - Setting %s with value %s \n", __FUNCTION__, __LINE__ ,PSM_DEVICE_CAPABILITIES, pidmDmlInfo->stConnectionInfo.Capabilities));
retPsmGet = IDM_RdkBus_SetParamValuesToDB(param_name,param_value);

_ansc_memset(param_name, 0, sizeof(param_name));
Expand Down Expand Up @@ -220,6 +223,7 @@ ANSC_STATUS IdmMgr_Data_Init(void)
gpidmDmlInfo.pidmDmlInfo = (PIDM_DML_INFO)AnscAllocateMemory(sizeof(IDM_DML_INFO));

IdmMgr_SetConfigData_Default();
CcspTraceInfo(("%s %d: Calling IdmMgr_get_IDM_ParametersFromPSM\n", __FUNCTION__, __LINE__));
IdmMgr_get_IDM_ParametersFromPSM();
pthread_mutex_init(&(gpidmDmlInfo.mDataMutex), &(muttex_attr));
return ANSC_STATUS_SUCCESS;
Expand Down
78 changes: 70 additions & 8 deletions source/InterDeviceManager/Idm_rbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,31 @@ rbusError_t X_RDK_Remote_MethodHandler(rbusHandle_t handle, char const* methodNa
IdmMgrDml_GetConfigData_release(pidmDmlInfo);
return RBUS_ERROR_BUS_ERROR;
}
CcspTraceInfo(("%s %d - Device.X_RDK_Remote.AddDeviceCapabilities() - %s \n", __FUNCTION__, __LINE__, str));

CcspTraceInfo(("%s %d - PSM capabilities before addition: %s \n", __FUNCTION__, __LINE__,pidmDmlInfo->stConnectionInfo.Capabilities));

CcspTraceInfo(("%s %d - Local device capabilities before addition: %s \n", __FUNCTION__, __LINE__,indexNode->stRemoteDeviceInfo.Capabilities));

if(strlen(indexNode->stRemoteDeviceInfo.Capabilities) == 0)
{
CcspTraceInfo(("%s %d - local device capabilities is empty \n", __FUNCTION__, __LINE__));
if(strlen(pidmDmlInfo->stConnectionInfo.Capabilities) > 0)
{
CcspTraceInfo(("%s %d - Updating local device capabilities from PSM %s \n", __FUNCTION__, __LINE__));
rc = strcpy_s(indexNode->stRemoteDeviceInfo.Capabilities, sizeof(indexNode->stRemoteDeviceInfo.Capabilities), pidmDmlInfo->stConnectionInfo.Capabilities);
ERR_CHK(rc);
}
else
{
// PSM data structre is also empty. Read it from factory and update local device cap
IdmMgr_GetFactoryDefaultValue(PSM_DEVICE_CAPABILITIES, pidmDmlInfo->stConnectionInfo.Capabilities);
CcspTraceInfo(("%s %d - Updating local device capabilities from factory PSM: %s \n", __FUNCTION__, __LINE__));
rc = strcpy_s(indexNode->stRemoteDeviceInfo.Capabilities, sizeof(indexNode->stRemoteDeviceInfo.Capabilities), pidmDmlInfo->stConnectionInfo.Capabilities);
ERR_CHK(rc);
}
}
/* Append local device capabilities from rbus value */
char* token = strtok(str, ",");
while (token != NULL)
{
Expand All @@ -590,13 +614,18 @@ rbusError_t X_RDK_Remote_MethodHandler(rbusHandle_t handle, char const* methodNa
}
token = strtok(NULL, ",");
}
strncpy(pidmDmlInfo->stConnectionInfo.Capabilities, indexNode->stRemoteDeviceInfo.Capabilities, sizeof(pidmDmlInfo->stConnectionInfo.Capabilities)-1);
CcspTraceInfo(("%s %d: DeviceCapabilities str = %s\n", __FUNCTION__, __LINE__, indexNode->stRemoteDeviceInfo.Capabilities));

IdmMgrDml_GetConfigData_release(pidmDmlInfo);

CcspTraceInfo(("%s %d - New local device capabilities after addition: %s \n", __FUNCTION__, __LINE__,indexNode->stRemoteDeviceInfo.Capabilities));

CcspTraceInfo(("%s %d - Updating PSM with new local device capabilities: %s \n", __FUNCTION__, __LINE__,indexNode->stRemoteDeviceInfo.Capabilities));

rc = strcpy_s(pidmDmlInfo->stConnectionInfo.Capabilities, sizeof(pidmDmlInfo->stConnectionInfo.Capabilities), indexNode->stRemoteDeviceInfo.Capabilities);
ERR_CHK(rc);
IdmMgrDml_GetConfigData_release(pidmDmlInfo);
CcspTraceInfo(("%s %d - Broadcsting local device capabilities \n", __FUNCTION__, __LINE__));
IDM_Broadcast_LocalDeviceInfo();
IdmMgr_write_IDM_ParametersToPSM();

return RBUS_ERROR_SUCCESS;
}
else if(strcmp(methodName, "Device.X_RDK_Remote.RemoveDeviceCapabilities()") == 0)
Expand All @@ -607,17 +636,44 @@ rbusError_t X_RDK_Remote_MethodHandler(rbusHandle_t handle, char const* methodNa
uint32_t source_len = 0;
char *source = NULL;

CcspTraceInfo(("%s %d - Device.X_RDK_Remote.RemoveDeviceCapabilities() \n", __FUNCTION__, __LINE__));

rbusValue_t value = rbusObject_GetValue(inParams, NULL );
out = rbusValue_GetString(value, &len);

indexNode = getRmDeviceNode(pidmDmlInfo, 1);

if(!indexNode || len == 0)
if(!indexNode || len == 0 || !out)
{
IdmMgrDml_GetConfigData_release(pidmDmlInfo);
return RBUS_ERROR_BUS_ERROR;
}
CcspTraceInfo(("%s %d - Device.X_RDK_Remote.RemoveDeviceCapabilities() - %s \n", __FUNCTION__, __LINE__,out));

CcspTraceInfo(("%s %d - PSM capabilities before removal: %s \n", __FUNCTION__, __LINE__,pidmDmlInfo->stConnectionInfo.Capabilities));

CcspTraceInfo(("%s %d - Local device capabilities before removal: %s \n", __FUNCTION__, __LINE__,indexNode->stRemoteDeviceInfo.Capabilities));

if(strlen(indexNode->stRemoteDeviceInfo.Capabilities) == 0)
{
CcspTraceInfo(("%s %d - local device capabilities is empty \n", __FUNCTION__, __LINE__));
if(strlen(pidmDmlInfo->stConnectionInfo.Capabilities) > 0)
{
CcspTraceInfo(("%s %d - Updating local device capabilities from PSM: %s \n", __FUNCTION__, __LINE__));
rc = strcpy_s(indexNode->stRemoteDeviceInfo.Capabilities, sizeof(indexNode->stRemoteDeviceInfo.Capabilities), pidmDmlInfo->stConnectionInfo.Capabilities);
ERR_CHK(rc);
}
else
{
// PSM data structre is also empty. Read it from factory and update local device cap
IdmMgr_GetFactoryDefaultValue(PSM_DEVICE_CAPABILITIES, pidmDmlInfo->stConnectionInfo.Capabilities);
CcspTraceInfo(("%s %d - Updating local device capabilities from factory PSM: %s \n", __FUNCTION__, __LINE__));
rc = strcpy_s(indexNode->stRemoteDeviceInfo.Capabilities, sizeof(indexNode->stRemoteDeviceInfo.Capabilities), pidmDmlInfo->stConnectionInfo.Capabilities);
ERR_CHK(rc);
}
}

/* Remove capability as requested by rbus value */
char * arr = indexNode->stRemoteDeviceInfo.Capabilities;
char* token = strtok((char *)out, ",");
while (token != NULL)
Expand All @@ -634,8 +690,8 @@ rbusError_t X_RDK_Remote_MethodHandler(rbusHandle_t handle, char const* methodNa
// removing last ; char
*(capPos - 1) = '\0';
}
IdmMgrDml_GetConfigData_release(pidmDmlInfo);
return RBUS_ERROR_SUCCESS;
// allow to update PSM and broadcast the capabilites after removal
break;
}
// Copy remaining strings excluding token and comma
source = capPos + (strlen(token) + 1);
Expand All @@ -650,10 +706,16 @@ rbusError_t X_RDK_Remote_MethodHandler(rbusHandle_t handle, char const* methodNa
}
token = strtok(NULL, ",");
}

/* Some capabilites might have removed in local device. write back to PSM */
CcspTraceInfo(("%s %d - New local device capabilities after removal : %s \n", __FUNCTION__, __LINE__, indexNode->stRemoteDeviceInfo.Capabilities));

CcspTraceInfo(("%s %d - Updating PSM with new local device capabilities : %s \n", __FUNCTION__, __LINE__, indexNode->stRemoteDeviceInfo.Capabilities));

rc = strcpy_s(pidmDmlInfo->stConnectionInfo.Capabilities, sizeof(pidmDmlInfo->stConnectionInfo.Capabilities), indexNode->stRemoteDeviceInfo.Capabilities);
ERR_CHK(rc);
CcspTraceInfo(("%s %d: DeviceCapabilities str = %s\n", __FUNCTION__, __LINE__, indexNode->stRemoteDeviceInfo.Capabilities));
IdmMgrDml_GetConfigData_release(pidmDmlInfo);
CcspTraceInfo(("%s %d - Publishing local device info \n", __FUNCTION__, __LINE__));
IDM_Broadcast_LocalDeviceInfo();
IdmMgr_write_IDM_ParametersToPSM();
return RBUS_ERROR_SUCCESS;
Expand Down