Skip to content

RDKCOM-5313: RDKBDEV-3174 T2 Telemetry JSON report incorrectly serializes all TR-181 parameter values as strings (missing type fidelity) #81

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
abdelkarimelhosni wants to merge 1 commit into from
Closed

RDKCOM-5313: RDKBDEV-3174 T2 Telemetry JSON report incorrectly serializes all TR-181 parameter values as strings (missing type fidelity) #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 24 additions & 1 deletion source/ccspinterface/busInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,33 @@
#define CCSP_COMPONENT_ID "eRT.com.cisco.spvtg.ccsp.telemetry"
#endif // CCSP_SUPPORT_ENABLED

typedef struct
/**
* Enumeration of possible types for TR-181 values
*/

typedef enum {
TR181_TYPE_STRING,
TR181_TYPE_INT,
TR181_TYPE_UNSIGNED,
TR181_TYPE_BOOLEAN,
TR181_TYPE_DATETIME,
TR181_TYPE_BASE64,
TR181_TYPE_LONG,
TR181_TYPE_UNSIGNED_LONG,
TR181_TYPE_FLOAT,
TR181_TYPE_DOUBLE
} TR181ParameterType;

/**
* Structure containing the name and value of a TR-181 parameter,
* as well as its type (added for correct JSON encoding).
*/

typedef struct
{
char *parameterName;
char *parameterValue;
TR181ParameterType type;

} tr181ValStruct_t;

Expand Down
172 changes: 106 additions & 66 deletions source/ccspinterface/ccspinterface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include "vector.h"
#include "t2common.h"
#include "ssp_global.h"
#include "ccsp_memory.h"
#include "ccsp_base_api.h"

static void *bus_handle = NULL;

Expand Down Expand Up @@ -226,8 +228,6 @@ T2ERROR getCCSPParamVal(const char* paramName, char **paramValue)

Vector* getCCSPProfileParamValues(Vector *paramList)
{
unsigned int i = 0;
int count = Vector_Size(paramList);
Vector *profileValueList = NULL;
Vector_Create(&profileValueList);

Expand All @@ -237,108 +237,148 @@ Vector* getCCSPProfileParamValues(Vector *paramList)
return profileValueList;
}

char** paramNames = (char **) malloc(count * sizeof(char*));
if(!paramNames)
{
T2Error("Unable allocate memory for paramNames\n");
return profileValueList;
}

T2Info("TR-181 Param count : %d\n", count);
for( ; i < count; i++ )
{
for(int i = 0; i < Vector_Size(paramList); i++) {
/* Preparing the storage for the result */
tr181ValStruct_t **paramValues = NULL;
parameterValStruct_t **ccspParamValues = NULL;
int paramValCount = 0;
int iterate = 0;
profileValues *profVals = (profileValues *) malloc(sizeof(profileValues));
int paramValCount = 0;
profileValues *profVals = calloc(1, sizeof(profileValues));
if(profVals == NULL)
{
T2Error("Unable allocate memory for profVals\n");
continue;
}
paramNames[0] = strdup(((Param *) Vector_At(paramList, i))->alias);
if(paramNames[0] == NULL)
{
T2Error("Unable allocate memory for paramNames[0]\n");
free(profVals);
continue;
}
if(T2ERROR_SUCCESS != ccspGetParameterValues((const char**)paramNames, 1, &ccspParamValues, &paramValCount))

/* Retrieving the TR-181 alias and duplicating it */
const char *alias = ((Param *)Vector_At(paramList, i))->alias;
char *paramName = alias ? strdup(alias) : NULL;
/* paramNames passed to the CCSP API (must be char*[], not const) */
char *paramNames[1] = { paramName ? strdup(paramName) : NULL };

/* --- CCSP component discovery --- */
char *destCompName = NULL;
char *destCompPath = NULL;
if(paramName)
{
T2Error("Failed to retrieve param : %s\n", paramNames[0]);
paramValCount = 0;
int discRet = findDestComponent(paramName, &destCompName, &destCompPath);
if(discRet != CCSP_SUCCESS) {
T2Error("Component discovery failed for %s (ret=%d)\n", paramName, discRet);
paramValCount = 0;
}
else
{
T2Debug("Discovered comp %s at %s\n", destCompName, destCompPath);
}
}
else

/* --- Call to the CCSP API to retrieve the values --- */
if(paramNames[0])
{
/* CID 175831: Dereference after null check */
if(ccspParamValues == NULL)
T2Debug("CcspBaseIf_getParameterValues for: %s\n", paramNames[0]);
int ret = CcspBaseIf_getParameterValues(
bus_handle,
destCompName,
destCompPath,
(char**)paramNames,
1,
&paramValCount,
&ccspParamValues);
if(ret != CCSP_SUCCESS)
{
T2Info("unable to get ccspParamValues \n");
free(profVals);
return profileValueList;
}
if(paramValCount == 0)
T2Error("CcspBaseIf_getParameterValues failed for %s (ret=%d)\n", paramNames[0], ret);
paramValCount = 0;
}
else
{
T2Info("ParameterName : %s Retrieved value count : %d\n", paramNames[0], paramValCount);
}
}

profVals->paramValueCount = paramValCount;
T2Debug("Received %d parameters for %s (CCSP)\n",
paramValCount,
paramNames[0] ? paramNames[0] : "(null)");

// Populate bus independent parameter value array
/* --- Constructing the TR-181 values array --- */
if(paramValCount == 0)
{
paramValues = (tr181ValStruct_t**) malloc(sizeof(tr181ValStruct_t*));
if(paramValues != NULL)
{
paramValues[0] = (tr181ValStruct_t*) malloc(sizeof(tr181ValStruct_t));
if(paramValues[0] != NULL)
{
paramValues[0]->parameterName = strdup(paramNames[0]);
paramValues[0]->parameterValue = strdup("NULL");
}
}
/* Parameters found → copy each one */
paramValues = calloc(1, sizeof(tr181ValStruct_t*));
paramValues[0] = calloc(1, sizeof(tr181ValStruct_t));
paramValues[0]->parameterName = strdup(paramName ? paramName : "");
paramValues[0]->parameterValue = strdup("NULL");
paramValues[0]->type = TR181_TYPE_STRING;
profVals->paramValueCount = 1;
}
else
{
paramValues = (tr181ValStruct_t**) malloc(paramValCount * sizeof(tr181ValStruct_t*));
if(paramValues != NULL)
/* Parameters found → copy each one */
paramValues = calloc(paramValCount, sizeof(tr181ValStruct_t*));
for(int j = 0; j < paramValCount; j++)
{
for( iterate = 0; iterate < paramValCount; ++iterate )
{
if(ccspParamValues[iterate])
{
paramValues[iterate] = (tr181ValStruct_t*) malloc(sizeof(tr181ValStruct_t));
if(paramValues[iterate])
{
paramValues[iterate]->parameterName = strdup((ccspParamValues[iterate])->parameterName);
paramValues[iterate]->parameterValue = strdup((ccspParamValues[iterate])->parameterValue);
}
}
parameterValStruct_t *cc = ccspParamValues[j];
paramValues[j] = calloc(1, sizeof(tr181ValStruct_t));
/* Copy name and value */
paramValues[j]->parameterName = strdup(cc->parameterName);
paramValues[j]->parameterValue = strdup(cc->parameterValue);
/* Assign the native TR-181 type */
switch(ccspParamValues[j]->type) {
case ccsp_boolean:
paramValues[j]->type = TR181_TYPE_BOOLEAN;
break;
case ccsp_int:
paramValues[j]->type = TR181_TYPE_INT;
break;
case ccsp_unsignedInt:
paramValues[j]->type = TR181_TYPE_UNSIGNED;
break;
case ccsp_long:
paramValues[j]->type = TR181_TYPE_LONG;
break;
case ccsp_unsignedLong:
paramValues[j]->type = TR181_TYPE_UNSIGNED_LONG;
break;
case ccsp_float:
paramValues[j]->type = TR181_TYPE_FLOAT;
break;
case ccsp_double:
paramValues[j]->type = TR181_TYPE_DOUBLE;
break;
case ccsp_dateTime:
paramValues[j]->type = TR181_TYPE_DATETIME;
break;
case ccsp_base64:
paramValues[j]->type = TR181_TYPE_BASE64;
break;
case ccsp_string:
default:
paramValues[j]->type = TR181_TYPE_STRING;
break;
}
free_parameterValStruct_t(bus_handle, paramValCount, ccspParamValues);
}
}

/* --- CCSP cleanup and profile finalization --- */
if(ccspParamValues)
{
free_parameterValStruct_t(bus_handle, paramValCount, ccspParamValues);
}
profVals->paramValues = paramValues;
// End of populating bus independent parameter value array
Vector_PushBack(profileValueList, profVals);
if(paramNames[0])
{
free(paramNames[0]);
}
}
if(paramNames)
{
free(paramNames);

/* Free the temporary strings */
free(paramName);
free(paramNames[0]);
free(destCompName);
free(destCompPath);
}

T2Debug("%s --Out\n", __FUNCTION__);
return profileValueList;
}


T2ERROR registerCcspT2EventListener(TelemetryEventCallback eventCB)
{
int ret;
Expand Down
Loading
Loading