Skip to content

RDKBDEV-3399: Add check if tr069 management server is initialized before calling any API by using s_MS_Init_Done. #24

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
satish-kotapati wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKBDEV-3399: Add check if tr069 management server is initialized before calling any API by using s_MS_Init_Done. #24

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
32 changes: 32 additions & 0 deletions source-embedded/DslhManagementServer/ccsp_management_server_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
extern char *CcspManagementServer_ComponentName;
extern msObjectInfo *objectInfo;
extern msParameterValSettingArray parameterSetting;
extern CCSP_BOOL s_MS_Init_Done;

int CcspManagementServer_SetParameterValues(
int sessionId,
Expand All @@ -85,6 +86,12 @@ int CcspManagementServer_SetParameterValues(
void *user_data
)
{
if(s_MS_Init_Done != TRUE)
{
CcspTraceInfo(("%s:%d Management server is not ready!!! \n", __FUNCTION__, __LINE__));
return CCSP_FAILURE;
}

//CcspTraceWarning("ms", ( "CcspManagementServer_SetParameterValues 0: %d.\n", commit));
/* Validate first. At the same time the values are stored in to parameterSetting. */
int validateResult = CcspManagementServer_ValidateParameterValues(sessionId, writeID, val, size, invalidParameterName);
Expand Down Expand Up @@ -112,6 +119,11 @@ int CcspManagementServer_SetCommit(
{
UNREFERENCED_PARAMETER(sessionId);
UNREFERENCED_PARAMETER(user_data);
if(s_MS_Init_Done != TRUE)
{
CcspTraceInfo(("%s:%d Management server is not ready!!! \n", __FUNCTION__, __LINE__));
return CCSP_FAILURE;
}
if(commit)
{
CcspManagementServer_CommitParameterValues(writeID);
Expand All @@ -133,6 +145,11 @@ int CcspManagementServer_GetParameterValues(
{
UNREFERENCED_PARAMETER(writeID);
UNREFERENCED_PARAMETER(user_data);
if(s_MS_Init_Done != TRUE)
{
CcspTraceInfo(("%s:%d Management server is not ready!!! \n", __FUNCTION__, __LINE__));
return CCSP_FAILURE;
}
/* first count return size. */
int i = 0;
*val_size = 0;
Expand Down Expand Up @@ -211,6 +228,11 @@ int CcspManagementServer_SetParameterAttributes(
)
{
UNREFERENCED_PARAMETER(user_data);
if(s_MS_Init_Done != TRUE)
{
CcspTraceInfo(("%s:%d Management server is not ready!!! \n", __FUNCTION__, __LINE__));
return CCSP_FAILURE;
}
int i = 0;
for(; i<size; i++)
{
Expand Down Expand Up @@ -256,6 +278,11 @@ int CcspManagementServer_GetParameterAttributes(
)
{
UNREFERENCED_PARAMETER(user_data);
if(s_MS_Init_Done != TRUE)
{
CcspTraceInfo(("%s:%d Management server is not ready!!! \n", __FUNCTION__, __LINE__));
return CCSP_FAILURE;
}
/* first count return size. */
int i = 0;
*val_size = 0;
Expand Down Expand Up @@ -422,6 +449,11 @@ int CcspManagementServer_GetParameterNames(
)
{
UNREFERENCED_PARAMETER(user_data);
if(s_MS_Init_Done != TRUE)
{
CcspTraceInfo(("%s:%d Management server is not ready!!! \n", __FUNCTION__, __LINE__));
return CCSP_FAILURE;
}
char *name;
errno_t rc = -1;
//CcspTraceWarning("sample_component", ( "CcspManagementServer_GetParameterNames 1: %s\n", parameterName));
Expand Down
2 changes: 1 addition & 1 deletion source-embedded/DslhManagementServer/ccsp_management_server_pa_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ extern char *pFirstUpstreamIpAddress;

extern char *g_Tr069PaAcsDefAddr;
extern char *_SupportedDataModelConfigFile;
static CCSP_BOOL s_MS_Init_Done = FALSE;
CCSP_BOOL s_MS_Init_Done = FALSE;

extern void waitUntilSystemReady( void* cbContext);

Expand Down
Loading