From 1781a7063dcccfe9f7f3f230b33dc4ac462e3c2d Mon Sep 17 00:00:00 2001 From: snagar564 Date: Wed, 27 May 2026 10:59:32 +0000 Subject: [PATCH 1/3] Reason for change: Fix for Client IPv4 address display when LAN DHCP is Disable Test Procedure: Build and Verify Priority: P1 Risks: low --- source/lm/lm_main.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/source/lm/lm_main.c b/source/lm/lm_main.c index 6d1221d..33dbfb8 100644 --- a/source/lm/lm_main.c +++ b/source/lm/lm_main.c @@ -711,6 +711,37 @@ static void LM_SET_ACTIVE_STATE_TIME_(int line, LmObjectHost *pHost,BOOL state){ if(pHost->ipv4Active == TRUE) { if (state) { + CcspTraceWarning(("<%s> Debug trace for XB10-2559 \n",__FUNCTION__)); +#if defined (_CBR_PRODUCT_REQ_) || defined (_ONESTACK_PRODUCT_REQ_) + char device_mode[32] = {0}; + char dhcp_server_enabled[32] = {0}; + + CcspTraceWarning(("<%s> _ONESTACK_PRODUCT_REQ_ \n",__FUNCTION__)); +#if defined (_ONESTACK_PRODUCT_REQ_) + if(!syscfg_get( NULL, "devicemode", device_mode, sizeof(device_mode))) + { + CcspTraceWarning(("<%s> devicemode: %s\n",_FUNCTION__, device_mode)); + if(strncmp(device_mode, "business", strlen("business")) == 0) + { +#endif + if(!syscfg_get( NULL, "dhcp_server_enabled", dhcp_server_enabled, sizeof(dhcp_server_enabled))) + { + CcspTraceWarning(("<%s> dhcp_server_enabled: %s\n",_FUNCTION__, dhcp_server_enabled)); + if(strncmp(dhcp_server_enabled, "0", strlen("0")) == 0) + { + CcspTraceWarning(("<%s> IPv4 Address removing from host table \n",__FUNCTION__)); + AnscFreeMemory(pHost->pStringParaValue[LM_HOST_IPAddressId]); + pHost->pStringParaValue[LM_HOST_IPAddressId] = NULL; + Host_FreeIPAddress(pHost, 4); + pHost->ipv4Active = FALSE; + } + } +#if defined (_ONESTACK_PRODUCT_REQ_) + } + } +#endif + if(pHost->ipv4Active == TRUE) { +#endif if(0 == FindHostInLeases(pHost->pStringParaValue[LM_HOST_IPAddressId], DNS_LEASE)){ char lan_ip_address[32] = {0}; char lan_net_mask[32] = {0}; @@ -727,6 +758,9 @@ static void LM_SET_ACTIVE_STATE_TIME_(int line, LmObjectHost *pHost,BOOL state){ else { CcspTraceWarning(("<%s> IPAddress not found in lease file : IPAddress = %s, MAC Addr = %s \n",__FUNCTION__, pHost->pStringParaValue[LM_HOST_IPAddressId], pHost->pStringParaValue[LM_HOST_PhysAddressId])); } +#if defined (_CBR_PRODUCT_REQ_) || defined (_ONESTACK_PRODUCT_REQ_) + } +#endif } } pHost->bBoolParaValue[LM_HOST_ActiveId] = state; From c17a38ef7faed5ce83c1873ba262ddca6a9fc1f4 Mon Sep 17 00:00:00 2001 From: SethupathyN Date: Wed, 27 May 2026 16:51:08 +0530 Subject: [PATCH 2/3] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- source/lm/lm_main.c | 64 +++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/source/lm/lm_main.c b/source/lm/lm_main.c index 33dbfb8..d545584 100644 --- a/source/lm/lm_main.c +++ b/source/lm/lm_main.c @@ -651,6 +651,36 @@ static void LM_SET_ACTIVE_STATE_TIME_(int line, LmObjectHost *pHost,BOOL state){ CcspTraceWarning(("RDKB_CONNECTED_CLIENTS: Wifi client with %s MacAddress and %s HostName gone offline\n",pHost->pStringParaValue[LM_HOST_PhysAddressId],pHost->pStringParaValue[LM_HOST_HostNameId])); OnboardLog("RDKB_CONNECTED_CLIENTS: Wifi client with %s MacAddress and %s HostName gone offline\n",pHost->pStringParaValue[LM_HOST_PhysAddressId],pHost->pStringParaValue[LM_HOST_HostNameId]); t2_event_d("WIFI_INFO_clientdisconnect", 1); + CcspTraceWarning(("<%s> Debug trace for XB10-2559 \n",__FUNCTION__)); +#if defined (_CBR_PRODUCT_REQ_) || defined (_ONESTACK_PRODUCT_REQ_) + char device_mode[32] = {0}; + char dhcp_server_enabled[32] = {0}; + + CcspTraceWarning(("<%s> _ONESTACK_PRODUCT_REQ_ \n",__FUNCTION__)); +#if defined (_ONESTACK_PRODUCT_REQ_) + if(!syscfg_get( NULL, "devicemode", device_mode, sizeof(device_mode))) + { + CcspTraceWarning(("<%s> devicemode: %s\n",__FUNCTION__, device_mode)); + if(strncmp(device_mode, "business", strlen("business")) == 0) + { +#endif + if(!syscfg_get( NULL, "dhcp_server_enabled", dhcp_server_enabled, sizeof(dhcp_server_enabled))) + { + CcspTraceWarning(("<%s> dhcp_server_enabled: %s\n",__FUNCTION__, dhcp_server_enabled)); + if(strncmp(dhcp_server_enabled, "0", strlen("0")) == 0) + { + CcspTraceWarning(("<%s> IPv4 Address removing from host table \n",__FUNCTION__)); + AnscFreeMemory(pHost->pStringParaValue[LM_HOST_IPAddressId]); + pHost->pStringParaValue[LM_HOST_IPAddressId] = NULL; + Host_FreeIPAddress(pHost, 4); + pHost->ipv4Active = FALSE; + } + } +#if defined (_ONESTACK_PRODUCT_REQ_) + } + } +#endif +#endif } #ifndef USE_NOTIFY_COMPONENT remove_Mac_to_band_mapping(pHost->pStringParaValue[LM_HOST_PhysAddressId]); @@ -711,37 +741,6 @@ static void LM_SET_ACTIVE_STATE_TIME_(int line, LmObjectHost *pHost,BOOL state){ if(pHost->ipv4Active == TRUE) { if (state) { - CcspTraceWarning(("<%s> Debug trace for XB10-2559 \n",__FUNCTION__)); -#if defined (_CBR_PRODUCT_REQ_) || defined (_ONESTACK_PRODUCT_REQ_) - char device_mode[32] = {0}; - char dhcp_server_enabled[32] = {0}; - - CcspTraceWarning(("<%s> _ONESTACK_PRODUCT_REQ_ \n",__FUNCTION__)); -#if defined (_ONESTACK_PRODUCT_REQ_) - if(!syscfg_get( NULL, "devicemode", device_mode, sizeof(device_mode))) - { - CcspTraceWarning(("<%s> devicemode: %s\n",_FUNCTION__, device_mode)); - if(strncmp(device_mode, "business", strlen("business")) == 0) - { -#endif - if(!syscfg_get( NULL, "dhcp_server_enabled", dhcp_server_enabled, sizeof(dhcp_server_enabled))) - { - CcspTraceWarning(("<%s> dhcp_server_enabled: %s\n",_FUNCTION__, dhcp_server_enabled)); - if(strncmp(dhcp_server_enabled, "0", strlen("0")) == 0) - { - CcspTraceWarning(("<%s> IPv4 Address removing from host table \n",__FUNCTION__)); - AnscFreeMemory(pHost->pStringParaValue[LM_HOST_IPAddressId]); - pHost->pStringParaValue[LM_HOST_IPAddressId] = NULL; - Host_FreeIPAddress(pHost, 4); - pHost->ipv4Active = FALSE; - } - } -#if defined (_ONESTACK_PRODUCT_REQ_) - } - } -#endif - if(pHost->ipv4Active == TRUE) { -#endif if(0 == FindHostInLeases(pHost->pStringParaValue[LM_HOST_IPAddressId], DNS_LEASE)){ char lan_ip_address[32] = {0}; char lan_net_mask[32] = {0}; @@ -758,9 +757,6 @@ static void LM_SET_ACTIVE_STATE_TIME_(int line, LmObjectHost *pHost,BOOL state){ else { CcspTraceWarning(("<%s> IPAddress not found in lease file : IPAddress = %s, MAC Addr = %s \n",__FUNCTION__, pHost->pStringParaValue[LM_HOST_IPAddressId], pHost->pStringParaValue[LM_HOST_PhysAddressId])); } -#if defined (_CBR_PRODUCT_REQ_) || defined (_ONESTACK_PRODUCT_REQ_) - } -#endif } } pHost->bBoolParaValue[LM_HOST_ActiveId] = state; From 0459711d2c6e04fcac9de967c665efa42541056f Mon Sep 17 00:00:00 2001 From: snagar564 Date: Tue, 16 Jun 2026 14:25:30 +0000 Subject: [PATCH 3/3] Debug fix for XB10-2559 --- source/lm/lm_main.c | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/source/lm/lm_main.c b/source/lm/lm_main.c index d545584..4e7ec3f 100644 --- a/source/lm/lm_main.c +++ b/source/lm/lm_main.c @@ -652,35 +652,11 @@ static void LM_SET_ACTIVE_STATE_TIME_(int line, LmObjectHost *pHost,BOOL state){ OnboardLog("RDKB_CONNECTED_CLIENTS: Wifi client with %s MacAddress and %s HostName gone offline\n",pHost->pStringParaValue[LM_HOST_PhysAddressId],pHost->pStringParaValue[LM_HOST_HostNameId]); t2_event_d("WIFI_INFO_clientdisconnect", 1); CcspTraceWarning(("<%s> Debug trace for XB10-2559 \n",__FUNCTION__)); -#if defined (_CBR_PRODUCT_REQ_) || defined (_ONESTACK_PRODUCT_REQ_) - char device_mode[32] = {0}; - char dhcp_server_enabled[32] = {0}; - - CcspTraceWarning(("<%s> _ONESTACK_PRODUCT_REQ_ \n",__FUNCTION__)); -#if defined (_ONESTACK_PRODUCT_REQ_) - if(!syscfg_get( NULL, "devicemode", device_mode, sizeof(device_mode))) - { - CcspTraceWarning(("<%s> devicemode: %s\n",__FUNCTION__, device_mode)); - if(strncmp(device_mode, "business", strlen("business")) == 0) - { -#endif - if(!syscfg_get( NULL, "dhcp_server_enabled", dhcp_server_enabled, sizeof(dhcp_server_enabled))) - { - CcspTraceWarning(("<%s> dhcp_server_enabled: %s\n",__FUNCTION__, dhcp_server_enabled)); - if(strncmp(dhcp_server_enabled, "0", strlen("0")) == 0) - { - CcspTraceWarning(("<%s> IPv4 Address removing from host table \n",__FUNCTION__)); - AnscFreeMemory(pHost->pStringParaValue[LM_HOST_IPAddressId]); - pHost->pStringParaValue[LM_HOST_IPAddressId] = NULL; - Host_FreeIPAddress(pHost, 4); - pHost->ipv4Active = FALSE; - } - } -#if defined (_ONESTACK_PRODUCT_REQ_) - } - } -#endif -#endif + CcspTraceWarning(("<%s> IPv4 Address removing from host table \n",__FUNCTION__)); + AnscFreeMemory(pHost->pStringParaValue[LM_HOST_IPAddressId]); + pHost->pStringParaValue[LM_HOST_IPAddressId] = NULL; + Host_FreeIPAddress(pHost, 4); + pHost->ipv4Active = FALSE; } #ifndef USE_NOTIFY_COMPONENT remove_Mac_to_band_mapping(pHost->pStringParaValue[LM_HOST_PhysAddressId]);