Skip to content

RDKCOM-5593: RDKBDEV-3446 IPQ Bug Fixes for QCOM #337

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

RDKCOM-5593: RDKBDEV-3446 IPQ Bug Fixes for QCOM #337

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
15 changes: 10 additions & 5 deletions source/scripts/init/src/apply_system_defaults/apply_system_defaults.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ static int get_PartnerID (char *PartnerID)

#if defined (_XB6_PRODUCT_REQ_)
sprintf( PartnerID, "%s", "unknown" );
#elif defined (_RDK_REF_PLATFORM_)
#elif defined (_RDK_REF_PLATFORM_) || defined (_COSA_QCA_ARM_)
sprintf( PartnerID, "%s", "RDKM");
#elif defined (_SR300_PRODUCT_REQ_) /* Default fall back option for ADA devices SKYH4-4946 */
sprintf( PartnerID, "%s", "sky-uk");
Expand Down Expand Up @@ -2404,6 +2404,7 @@ static int apply_partnerId_default_values (char *data, char *PartnerID)
cJSON *alwaysParamObjVal = NULL;
char *error_ptr = NULL;
int iterator = 0;
char buf[50] = {0};

/*
* Case 1:
Expand Down Expand Up @@ -2534,8 +2535,9 @@ static int apply_partnerId_default_values (char *data, char *PartnerID)
if ( paramObjVal != NULL )
{
defaultAdminIP = paramObjVal->valuestring;
syscfg_get( NULL, "lan_ipaddr", buf, sizeof( buf ));

if (defaultAdminIP != NULL)
if ((defaultAdminIP != NULL) && (strcmp(buf, defaultAdminIP) == 0))
{
set_syscfg_partner_values(defaultAdminIP,"lan_ipaddr");
defaultAdminIP = NULL;
Expand All @@ -2550,8 +2552,9 @@ static int apply_partnerId_default_values (char *data, char *PartnerID)
if ( paramObjVal != NULL )
{
subnetRange = paramObjVal->valuestring;
syscfg_get( NULL, "lan_netmask", buf, sizeof( buf ));

if (subnetRange != NULL)
if ((subnetRange != NULL) && (strcmp(buf, subnetRange) == 0))
{
set_syscfg_partner_values(subnetRange,"lan_netmask");
subnetRange = NULL;
Expand All @@ -2565,8 +2568,9 @@ static int apply_partnerId_default_values (char *data, char *PartnerID)
if ( paramObjVal != NULL )
{
minAddress = paramObjVal->valuestring;
syscfg_get( NULL, "dhcp_start", buf, sizeof( buf ));

if (minAddress != NULL)
if ((minAddress != NULL) && (strcmp(buf, minAddress) ==0))
{
set_syscfg_partner_values(minAddress,"dhcp_start");
minAddress = NULL;
Expand All @@ -2580,8 +2584,9 @@ static int apply_partnerId_default_values (char *data, char *PartnerID)
if ( paramObjVal != NULL )
{
maxAddress = paramObjVal->valuestring;
syscfg_get( NULL, "dhcp_end", buf, sizeof( buf ));

if (maxAddress != NULL)
if ((maxAddress != NULL) && (strcmp(buf, maxAddress) == 0))
{
set_syscfg_partner_values(maxAddress,"dhcp_end");
Comment on lines 2586 to 2591
maxAddress = NULL;
Expand Down
2 changes: 2 additions & 0 deletions source/util/utils/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ int vsystem(const char *fmt, ...)
if (n < 0 || n >= sizeof(cmd))
return -1;

#ifndef _COSA_QCA_ARM_
fprintf(stderr, "%s: %s\n", __FUNCTION__, cmd);
#endif
Comment on lines +69 to +71
return system(cmd);
}

Expand Down
Loading