Skip to content
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

XER10-810 : Observed mso page is not accessible with latest Sprint NG Build. #92

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

XER10-810 : Observed mso page is not accessible with latest Sprint NG Build. #92

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
38 changes: 31 additions & 7 deletions source/WanManager/wanmgr_policy_auto_impl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,27 @@ static int WanMgr_RdkBus_AddAllIntfsToLanBridge (WanMgr_Policy_Controller_t * pW
#if (defined (_XB6_PRODUCT_REQ_) || defined (_CBR2_PRODUCT_REQ_) || defined(_PLATFORM_RASPBERRYPI_))
//TODO: this is a workaround to support upgarde from Comcast autowan policy to Unification build
#define MAX_WanModeToIfaceMap 2
static const int lastWanModeToIface_map[MAX_WanModeToIfaceMap] = {2, 1};
#define WAN_INDEX_DOCSIS 2
#define WAN_INDEX_ETHWAN 1

bool isLastActiveLinkFromSysCfg(DML_WAN_IFACE* pWanIfaceData)
{
char buf[10] ={0};
if (syscfg_get(NULL, "last_wan_mode", buf, sizeof(buf)) == 0)
{
int mode = atoi(buf);
if(pWanIfaceData->uiIfaceIdx < MAX_WanModeToIfaceMap && mode == lastWanModeToIface_map[pWanIfaceData->uiIfaceIdx])
UINT IfaceIndex = WAN_INDEX_DOCSIS;

if ( strstr(pWanIfaceData->BaseInterface, "CableModem") )
{
IfaceIndex = WAN_INDEX_DOCSIS;
}
else if ( strstr(pWanIfaceData->BaseInterface, "Ethernet") )
{
IfaceIndex = WAN_INDEX_ETHWAN;
}

if(pWanIfaceData->uiIfaceIdx < MAX_WanModeToIfaceMap && mode == IfaceIndex)
{
CcspTraceInfo(("%s %d: Iface Id %d is the last_wan_mode and will be scanned first\n", __FUNCTION__, __LINE__, pWanIfaceData->uiIfaceIdx));
return TRUE;
Expand All @@ -140,11 +152,23 @@ bool isLastActiveLinkFromSysCfg(DML_WAN_IFACE* pWanIfaceData)
return FALSE;
}

void setActiveLinkToSysCfg(UINT IfaceIndex)
void setActiveLinkToSysCfg(WanMgr_Policy_Controller_t *pWanController)
{
char buf[10] ={0};
CcspTraceInfo(("%s %d: last_wan_mode, curr_wan_mode set to %d\n", __FUNCTION__, __LINE__, lastWanModeToIface_map[IfaceIndex]));
snprintf(buf, sizeof(buf), "%d", lastWanModeToIface_map[IfaceIndex]);
char buf[10] = {0};
UINT IfaceIndex = WAN_INDEX_DOCSIS;
DML_WAN_IFACE *pActiveInterface = &(pWanController->pWanActiveIfaceData->data);

if ( strstr(pActiveInterface->BaseInterface, "CableModem") )
{
IfaceIndex = WAN_INDEX_DOCSIS;
}
else if ( strstr(pActiveInterface->BaseInterface, "Ethernet") )
{
IfaceIndex = WAN_INDEX_ETHWAN;
}

CcspTraceInfo(("%s %d: last_wan_mode, curr_wan_mode set to %d\n", __FUNCTION__, __LINE__, IfaceIndex));
snprintf(buf, sizeof(buf), "%d", IfaceIndex);
syscfg_set_commit(NULL, "last_wan_mode", buf);
syscfg_set_commit(NULL, "curr_wan_mode", buf);
}
Expand Down Expand Up @@ -607,7 +631,7 @@ static WcAwPolicyState_t Transition_InterfaceSelected (WanMgr_Policy_Controller_
*/
if (strstr(pActiveInterface->BaseInterface, "CableModem") || (strstr(pActiveInterface->BaseInterface, "Ethernet")))
{
setActiveLinkToSysCfg(pWanController->activeInterfaceIdx);
setActiveLinkToSysCfg(pWanController);
#if defined(AUTOWAN_ENABLE)
char operationalMode[64] ={0};
strncpy(operationalMode, strstr(pActiveInterface->BaseInterface, "CableModem")?"DOCSIS":"Ethernet", sizeof(operationalMode));
Expand Down