RDKB-56964 :The AutoWan Selection Timer is not functioning as intended (

#59) * RDKB-56964 : The AutoWan Selection Timer is not functioning as intended Reason for change: Removing Physical status check when interface is in scanning state. Test Procedure: Updated in Jira. Risks: none Priority: P1 Signed-off-by: Parthiban Selvaraj <[email protected]> * Adding Transition_ScanningInterfaceDown Signed-off-by: S-Parthiban-Selvaraj <[email protected]> --------- Signed-off-by: Parthiban Selvaraj <[email protected]> Signed-off-by: S-Parthiban-Selvaraj <[email protected]>
rdkcentral · Sep 23, 2024 · f3db8e7 · f3db8e7
1 parent 03b25e8
commit f3db8e7
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/source/WanManager/wanmgr_policy_auto_impl.c b/source/WanManager/wanmgr_policy_auto_impl.c
@@ -630,6 +630,24 @@ static WcAwPolicyState_t Transition_InterfaceSelected (WanMgr_Policy_Controller_
     return STATE_AUTO_WAN_INTERFACE_WAITING;
 }
 
+/*
+ * Transition_ScanningInterfaceDown()
+ * - Interface is down while scanning. 
+ * - Do nothing.  Roll back to STATE_AUTO_WAN_INTERFACE_WAITING without restaring the timer.
+ */
+static WcAwPolicyState_t Transition_ScanningInterfaceDown (WanMgr_Policy_Controller_t * pWanController)
+{
+    if ((pWanController == NULL) || (pWanController->pWanActiveIfaceData == NULL))
+    {
+        CcspTraceError(("%s %d: Invalid args\n", __FUNCTION__, __LINE__));
+        return STATE_AUTO_WAN_ERROR;
+    }
+
+    CcspTraceInfo(("%s %d: State changed to STATE_AUTO_WAN_INTERFACE_WAITING \n", __FUNCTION__, __LINE__));
+
+    return STATE_AUTO_WAN_INTERFACE_WAITING;
+}
+
 /*
  * Transition_InterfaceInvalid()
  * - called when interface failed to be validated before its SelectionTimeout, or WAN disbaled for interface
@@ -1149,14 +1167,22 @@ static WcAwPolicyState_t State_ScanningInterface (WanMgr_Policy_Controller_t * p
         return Transition_InterfaceValidated(pWanController);
     }
 
-    // If Phy is not UP or Interace is WAN disabled, move to interface deselect transition
-    if ((pActiveInterface->BaseInterfaceStatus != WAN_IFACE_PHY_STATUS_UP) || (pActiveInterface->Selection.Enable == FALSE))
+    // If Interace is WAN disabled, move to interface deselect transition
+    if (pActiveInterface->Selection.Enable == FALSE)
     { 
         CcspTraceInfo(("%s %d: selected interface index:%d is BaseInetrfaceStatus = %s, Selection.Enable = %d\n", __FUNCTION__, __LINE__, pWanController->activeInterfaceIdx, 
                     (pActiveInterface->BaseInterfaceStatus == WAN_IFACE_PHY_STATUS_UP)?"UP":"DOWN", pActiveInterface->Selection.Enable));
         return Transition_InterfaceDeselect(pWanController);
     }
 
+
+    //If PHY is down ,rollback to waiting state after all VISM are terminated.
+    if(pActiveInterface->BaseInterfaceStatus != WAN_IFACE_PHY_STATUS_UP && WanMgr_Get_ISM_RunningStatus(pWanController->activeInterfaceIdx) == FALSE) 
+    {
+        CcspTraceInfo(("%s %d: selected interface index:%d is BaseInetrfaceStatus DOWN. \n", __FUNCTION__, __LINE__, pWanController->activeInterfaceIdx ));
+        return Transition_ScanningInterfaceDown(pWanController);
+    }
+
     // checked if iface is validated or only interface enabled
     if ((pActiveInterface->VirtIfList->Status == WAN_IFACE_STATUS_UP) || 
         (pActiveInterface->VirtIfList->Status == WAN_IFACE_STATUS_STANDBY) ||