Skip to content

RDKB-63854: WanManager is not Restarting the DHCPv4 and DHCPv6 client parameters automatically when the parameters are disabled #212

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
aadhithan01 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

RDKB-63854: WanManager is not Restarting the DHCPv4 and DHCPv6 client parameters automatically when the parameters are disabled #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aecd270
Fix: wan_transition_ipv6_down() race condition skipping DHCPv6 self-heal
aadhithan01 May 19, 2026
b876b46
Fix: treat Dhcp6cPid<=1 as invalid for self-heal PID check
aadhithan01 May 19, 2026
b4cb180
Fix DHCPv6 self-heal race condition on first disable/enable cycle
aadhithan01 May 25, 2026
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
38 changes: 34 additions & 4 deletions source/WanManager/wanmgr_dhcp_event_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "wanmgr_dhcp_client_events.h"
#include "wanmgr_net_utils.h"
#include "wanmgr_dhcpv6_apis.h"

extern WANMGR_DATA_ST gWanMgrDataBase;
#ifdef FEATURE_MAPE
#include "wanmgr_map_apis.h"
#endif
Expand Down Expand Up @@ -144,8 +146,22 @@ void WanMgr_ProcessDhcpClientEvent(DhcpEventThreadArgs *eventData)
break;

case DHCP_CLIENT_STOPPED:
CcspTraceInfo(("%s-%d : DHCPv4 client stopped for %s\n", __FUNCTION__, __LINE__, pVirtIf->Name));
pVirtIf->IP.Dhcp4cStatus = DHCPC_STOPPED;
CcspTraceInfo(("%s-%d : DHCPv4 client stopped for %s (Dhcp4cStatus=%d)\n", __FUNCTION__, __LINE__, pVirtIf->Name, pVirtIf->IP.Dhcp4cStatus));
if (pVirtIf->IP.Dhcp4cStatus == DHCPC_STARTED)
{
/* Client was stopped externally (not by WanManager).
* WanManager_StopDhcpv4Client sets Dhcp4cStatus=STOPPED
* synchronously before any event arrives, so DHCPC_STARTED
* here means the stop was NOT initiated by WanManager.
* Restart the client to maintain IPv4 connectivity. */
pVirtIf->IP.Dhcp4cStatus = DHCPC_STOPPED;
CcspTraceInfo(("%s-%d : SELFHEAL - Restarting DHCPv4 client for %s\n", __FUNCTION__, __LINE__, pVirtIf->Name));
WanManager_StartDhcpv4Client(pVirtIf, gWanMgrDataBase.IfaceCtrl.pIface[pVirtIf->baseIfIdx].data.Name, gWanMgrDataBase.IfaceCtrl.pIface[pVirtIf->baseIfIdx].data.IfaceType);
}
else
{
pVirtIf->IP.Dhcp4cStatus = DHCPC_STOPPED;
}
Comment on lines +150 to +164
break;

case DHCP_CLIENT_FAILED:
Expand Down Expand Up @@ -207,8 +223,22 @@ void WanMgr_ProcessDhcpClientEvent(DhcpEventThreadArgs *eventData)
break;

case DHCP_CLIENT_STOPPED:
CcspTraceInfo(("%s-%d : DHCPv6 client stopped for %s\n", __FUNCTION__, __LINE__, pVirtIf->Name));
pVirtIf->IP.Dhcp6cStatus = DHCPC_STOPPED;
CcspTraceInfo(("%s-%d : DHCPv6 client stopped for %s (Dhcp6cStatus=%d)\n", __FUNCTION__, __LINE__, pVirtIf->Name, pVirtIf->IP.Dhcp6cStatus));
if (pVirtIf->IP.Dhcp6cStatus == DHCPC_STARTED)
{
/* Client was stopped externally (not by WanManager).
* WanManager_StopDhcpv6Client sets Dhcp6cStatus=STOPPED
* synchronously before any event arrives, so DHCPC_STARTED
* here means the stop was NOT initiated by WanManager.
* Restart the client to maintain IPv6 connectivity. */
pVirtIf->IP.Dhcp6cStatus = DHCPC_STOPPED;
CcspTraceInfo(("%s-%d : SELFHEAL - Restarting DHCPv6 client for %s\n", __FUNCTION__, __LINE__, pVirtIf->Name));
WanManager_StartDhcpv6Client(pVirtIf, gWanMgrDataBase.IfaceCtrl.pIface[pVirtIf->baseIfIdx].data.IfaceType);
}
Comment on lines +226 to +237
else
{
pVirtIf->IP.Dhcp6cStatus = DHCPC_STOPPED;
}
break;

case DHCP_CLIENT_FAILED:
Expand Down
1 change: 0 additions & 1 deletion source/WanManager/wanmgr_interface_sm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2927,7 +2927,6 @@ static eWanState_t wan_transition_ipv6_down(WanMgr_IfaceSM_Controller_t* pWanIfa
}
else
{

if(p_VirtIf->IP.Dhcp6cStatus != DHCPC_STARTED)
{
/* Start DHCPv6 Client */
Expand Down
22 changes: 16 additions & 6 deletions source/WanManager/wanmgr_net_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,17 +546,22 @@ ANSC_STATUS WanManager_StopDhcpv6Client(DML_VIRTUAL_IFACE* pVirtIf, DHCP_RELEASE
snprintf( dmlName, sizeof(dmlName), "%s.Enable", pVirtIf->IP.DHCPv6Iface );
snprintf( dmlValue, sizeof(dmlValue), "%s", "false");
}
/* Set status to STOPPED before issuing the stop request to eliminate the
* race where the STOPPED event arrives (and the worker thread processes it)
* before WanMgr_RdkBus_SetParamValues returns. Without this, the event
* handler would see Dhcp6cStatus==STARTED and trigger a spurious self-heal
* restart for an intentional stop. */
pVirtIf->IP.Dhcp6cStatus = DHCPC_STOPPED;
pVirtIf->IP.Dhcp6cPid = 0;
WanMgr_UnSubscribeDhcpClientEvents(pVirtIf->IP.DHCPv6Iface);
if (ANSC_STATUS_SUCCESS == WanMgr_RdkBus_SetParamValues(DHCPMGR_COMPONENT_NAME, DHCPMGR_DBUS_PATH, dmlName, dmlValue, ccsp_boolean, TRUE))
{
CcspTraceInfo(("%s %d - Successfully set [%s] to DHCP Manager \n", __FUNCTION__, __LINE__, pVirtIf->Name));
pVirtIf->IP.Dhcp6cStatus = DHCPC_STOPPED;
pVirtIf->IP.Dhcp6cPid = 0;
}
else
{
CcspTraceInfo(("%s %d - Failed setting [%s] to DHCP Manager \n", __FUNCTION__, __LINE__, pVirtIf->Name));
}
WanMgr_UnSubscribeDhcpClientEvents(pVirtIf->IP.DHCPv6Iface);
return ANSC_STATUS_SUCCESS;
#else
if (is_release_required == STOP_DHCP_WITH_RELEASE)
Expand Down Expand Up @@ -662,17 +667,22 @@ ANSC_STATUS WanManager_StopDhcpv4Client(DML_VIRTUAL_IFACE* pVirtIf, DHCP_RELEASE
snprintf( dmlName, sizeof(dmlName), "%s.Enable", pVirtIf->IP.DHCPv4Iface );
snprintf( dmlValue, sizeof(dmlValue), "%s", "false");
}
/* Set status to STOPPED before issuing the stop request to eliminate the
* race where the STOPPED event arrives (and the worker thread processes it)
* before WanMgr_RdkBus_SetParamValues returns. Without this, the event
* handler would see Dhcp4cStatus==STARTED and trigger a spurious self-heal
* restart for an intentional stop. */
pVirtIf->IP.Dhcp4cStatus = DHCPC_STOPPED;
pVirtIf->IP.Dhcp4cPid = 0;
WanMgr_UnSubscribeDhcpClientEvents(pVirtIf->IP.DHCPv4Iface);
if (ANSC_STATUS_SUCCESS == WanMgr_RdkBus_SetParamValues(DHCPMGR_COMPONENT_NAME, DHCPMGR_DBUS_PATH, dmlName, dmlValue, ccsp_boolean, TRUE))
{
CcspTraceInfo(("%s %d - Successfully set [%s] to DHCP Manager \n", __FUNCTION__, __LINE__, pVirtIf->Name));
pVirtIf->IP.Dhcp4cStatus = DHCPC_STOPPED;
pVirtIf->IP.Dhcp4cPid = 0;
}
else
{
CcspTraceInfo(("%s %d - Failed setting [%s] to DHCP Manager \n", __FUNCTION__, __LINE__, pVirtIf->Name));
}
WanMgr_UnSubscribeDhcpClientEvents(pVirtIf->IP.DHCPv4Iface);
if (IsReleaseNeeded == STOP_DHCP_WITH_RELEASE)
{
//TODO: sleep added to allow dhcpv4 client to send release before interface deconfig. This should be handled by dhcpmanager itself.
Expand Down
Loading