RDKB-58910 : Move the WAN IPV6 configuration from LAN bridge

source/TR-181/middle_layer_src/wanmgr_rdkbus_common.h

@@ -90,7 +90,6 @@ typedef  struct _CONTEXT_LINK_OBJECT
 
 #define  DML_ALIAS_NAME_LENGTH                 64
 #define  DML_DHCP_CLIENT_IFNAME                "erouter0"
-#define  CFG_TR181_DHCPv6_SERVER_IfName        "brlan0"
 
 
 ANSC_STATUS SListPushEntryByInsNum (PSLIST_HEADER pListHead, PCONTEXT_LINK_OBJECT pLinkContext);

source/WanManager/DHCPv6cMsgHandler/dhcpv6c_msg_apis.c

@@ -674,14 +674,19 @@ static void * WanMgr_DhcpV6MsgHandler()
                             CcspTraceInfo(("%s %d Prefix Assigned\n", __FUNCTION__, __LINE__));
                             snprintf(dhcpv6_data.sitePrefix, sizeof(dhcpv6_data.sitePrefix), "%s/%d", v6pref, pref_len);
 
-                            dhcpv6_data.prefixAssigned = TRUE;
                             strncpy(dhcpv6_data.pdIfAddress, "", sizeof(dhcpv6_data.pdIfAddress));
                             dhcpv6_data.prefixCmd = 0;
                             remove_single_quote(iapd_pretm);
                             remove_single_quote(iapd_vldtm);
                             sscanf(iapd_pretm, "%d", &(dhcpv6_data.prefixPltime));
                             sscanf(iapd_vldtm, "%d", &(dhcpv6_data.prefixVltime));
-
+                            // Set prefixAssigned to TRUE only if both preferred and valid lifetimes are positive
+                            if (dhcpv6_data.prefixPltime > 0 && dhcpv6_data.prefixVltime > 0) 
+                            {
+                                dhcpv6_data.prefixAssigned = TRUE;
+                            } else {
+                                dhcpv6_data.prefixAssigned = FALSE;
+                            }
                             //IPv6 prefix related sysevents
                             // Define the eventMaps array as before
                             Ipv6SyseventMap eventMaps[] = {

source/WanManager/wanmgr_dhcp_event_handler.c

@@ -104,6 +104,17 @@ static void copyDhcpv6Data(WANMGR_IPV6_DATA* pDhcpv6Data, const DHCP_MGR_IPV6_MS
     pDhcpv6Data->prefixAssigned = leaseInfo->prefixAssigned;
     pDhcpv6Data->domainNameAssigned = leaseInfo->domainNameAssigned;
     pDhcpv6Data->ipv6_TimeOffset = leaseInfo->ipv6_TimeOffset;
+    if(!pDhcpv6Data->addrAssigned && pDhcpv6Data->prefixAssigned)
+    {
+        /* In an IPv6 lease, if only IAPD is received and we never received IANA, 
+         * We can use the received IAPD to construct a Ipv6 /128 address which can be used for managerment and voice ...
+         * If we reach this point, only IAPD has been received. Calculate Wan Ipv6 address 
+         */
+
+        CcspTraceInfo(("IANA is not assigned by DHCPV6. Constructing WAN address from the IAPD for Wan Interface \n"));
+        wanmgr_construct_wan_address_from_IAPD(pDhcpv6Data);
+    }
+
 }
 
 pthread_mutex_t DhcpClientEvents_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -189,7 +200,7 @@ void* WanMgr_DhcpClientEventsHandler_Thread(void *arg)
                     //TODO: Check for sysevents
                     if(pVirtIf->IP.Ipv6Data.prefixAssigned == TRUE)
                     {
-                        WanManager_Ipv6PrefixUtil(pVirtIf->Name, SET_LFT, pVirtIf->IP.Ipv6Data.prefixPltime, pVirtIf->IP.Ipv6Data.prefixVltime);
+                        WanManager_Ipv6AddrUtil(pVirtIf, SET_LFT);
                         sysevent_set(sysevent_fd, sysevent_token, SYSEVENT_RADVD_RESTART, NULL, 0);
                     }
                     CcspTraceInfo(("%s-%d : DHCPv6 lease renewed for %s\n", __FUNCTION__, __LINE__, pVirtIf->Name));

source/WanManager/wanmgr_dhcpv6_apis.h

@@ -49,7 +49,7 @@
     #define ULOGF
 #endif
 
-#define COSA_DML_DHCPV6_SERVER_IFNAME                 CFG_TR181_DHCPv6_SERVER_IfName
+#define COSA_DML_DHCPV6_SERVER_IFNAME                 "brlan0"
 
 #define COSA_DML_DHCPV6C_PREF_SYSEVENT_NAME           "tr_"DML_DHCP_CLIENT_IFNAME"_dhcpv6_client_v6pref"
 #define COSA_DML_DHCPV6C_PREF_IAID_SYSEVENT_NAME      "tr_"DML_DHCP_CLIENT_IFNAME"_dhcpv6_client_pref_iaid"
@@ -353,6 +353,31 @@ void _get_shell_output(FILE *fp, char * out, int len);
  ************************************************************************************/
 int setUpLanPrefixIPv6(DML_VIRTUAL_IFACE* pVirtIf);
 
+/**
+ * @brief Constructs a dedicated WAN IPv6 address from the received IAPD (IA Prefix Delegation).
+ *
+ * This function extracts the IPv6 prefix and its length from the given IAPD data. It then uses
+ * the provided prefix to construct a unique WAN IPv6 address by using the next available /64 subnet.
+ * The first /64 subnet of the IAPD is reserved for LAN, while the next /64 is used for the WAN address.
+ * The constructed WAN address is assigned to the specified WAN interface.
+ *
+ * @param[in] pIpv6DataNew Pointer to the WANMGR_IPV6_DATA structure.
+ *
+ * @return 
+ * - 0 on success.
+ * - -1 on failure (e.g., invalid prefix format, prefix length >= 64, or system command failure).
+ *
+ * @note The function assumes that if the prefix length is less than 64, there are sufficient bits available
+ *       to split the IAPD into multiple /64 subnets. If the prefix length is 64 or greater, it logs an error 
+ *       and returns -1 since further subnetting is not possible.
+ *
+ * ### Example:
+ * Given an IAPD of "2a06:5906:13:d000::/56", the function may construct the following addresses:
+ * - LAN IPv6 Address Range: "2a06:5906:13:d000::/64"
+ * - WAN IPv6 Address: "2a06:5906:13:d001::1/128"
+ */
+int wanmgr_construct_wan_address_from_IAPD(WANMGR_IPV6_DATA *pIpv6DataNew);
+
 ANSC_STATUS WanMgr_Handle_Dhcpv6_NetLink_Address_Event(IPv6NetLinkAddrEvent *pstAddrEvent);
 
 #endif //_WANMGR_DHCPV6_APIS_H_

source/WanManager/wanmgr_interface_sm.c

@@ -59,9 +59,6 @@
 #define POSTD_START_FILE "/tmp/.postd_started"
 #define SELECTED_MODE_TIMEOUT_SECONDS 10
 
-#if defined(FEATURE_IPOE_HEALTH_CHECK) && defined(IPOE_HEALTH_CHECK_LAN_SYNC_SUPPORT)
-extern lanState_t lanState;
-#endif
 
 #if defined(FEATURE_464XLAT)
 typedef enum
@@ -198,7 +195,7 @@ static ANSC_STATUS WanManager_ClearDHCPData(DML_VIRTUAL_IFACE * pVirtIf);
  * lan ipv6 address ready to use.
  * @return RETURN_OK on success else RETURN_ERR
  *************************************************************************************/
-static int checkIpv6LanAddressIsReadyToUse(DML_VIRTUAL_IFACE* p_VirtIf);
+static int checkIpv6AddressIsReadyToUse(DML_VIRTUAL_IFACE* p_VirtIf);
 
 #ifdef FEATURE_MAPE
 /*************************************************************************************
@@ -1035,57 +1032,37 @@ int wan_updateDNS(WanMgr_IfaceSM_Controller_t* pWanIfaceCtrl, BOOL addIPv4, BOOL
     return ret;
 }
 
-/* Check Duplicate Address Detection (DAD) status. The way it works is that
-   after an address is added to an interface, the operating system uses the
-   Neighbor Discovery Protocol to check if any other host on the network
-   has the same address. The whole process will take around 3 to 4 seconds
-   to complete. Also we need to check and ensure that the gateway has
-   a valid default route entry.
+
+/**
+ * @brief Checks if the IPv6 address is ready to use.
+ *
+ * This function checks the tentative address, detects Duplicate Address Detection (DAD) failure, and verifies the default route. 
+ * If DAD fails, it also triggers a Router Solicitation.
+ *
+ * @param p_VirtIf Pointer to the virtual interface structure.
+ * @return int 0 on success, negative value on failure.
  */
-static int checkIpv6LanAddressIsReadyToUse(DML_VIRTUAL_IFACE* p_VirtIf)
+static int checkIpv6AddressIsReadyToUse(DML_VIRTUAL_IFACE* p_VirtIf)
 {
     char buffer[BUFLEN_256] = {0};
-    FILE *fp_dad   = NULL;
-    FILE *fp_route = NULL;
+    FILE *fp_dad       = NULL;
+    FILE *fp_route     = NULL;
     int dad_flag       = 0;
     int route_flag     = 0;
-    int i;
-    char IfaceName[BUFLEN_16] = {0};
-    int BridgeMode = 0;
-
-    { //TODO : temporary debug code to identify the bridgemode sysevent failure issue.
-        char Output[BUFLEN_16] = {0};
-        if (sysevent_get(sysevent_fd, sysevent_token, "bridge_mode", Output, sizeof(Output)) !=0)
-        {
-            CcspTraceError(("%s-%d: bridge_mode sysevent get failed. \n", __FUNCTION__, __LINE__));
-        }
-        BridgeMode = atoi(Output);
-        CcspTraceInfo(("%s-%d: <<DEBUG>> bridge_mode sysevent value set to =%d \n", __FUNCTION__, __LINE__,  BridgeMode));
-    }
-     /*TODO:
-     *Below Code should be removed once V6 Prefix/IP is assigned on erouter0 Instead of brlan0 for sky Devices.
-     */
-    strncpy(IfaceName, ETH_BRIDGE_NAME, sizeof(IfaceName)-1);
-    if (WanMgr_isBridgeModeEnabled() == TRUE)
-    {
-        CcspTraceInfo(("%s-%d: Device is in bridge mode. Assigning IPv6 address on WAN interface.\n", __FUNCTION__, __LINE__));
-        memset(IfaceName, 0, sizeof(IfaceName));
-        strncpy(IfaceName, p_VirtIf->Name, sizeof(IfaceName)-1);
-    }
-    CcspTraceInfo(("%s-%d: IfaceName=%s, BridgeMode=%d \n", __FUNCTION__, __LINE__, IfaceName, BridgeMode));
 
-    /* TODO: the below code assumes if the LAN ipv6 address is tentaive for 15 seconds DAD has failed. Do we need additional check?
-     * IANA dad is handled in the DHCPv6 client for the Wan Interface.
-     * Should we remove the IP from LAN bridge and request a different Delegated prefix?
-     * Should we use EUI-64 based Interface identifiers for all platforms?
-     */
+    /* Check Duplicate Address Detection (DAD) status. The way it works is that after an address is added to an interface, the operating system uses the
+    Neighbor Discovery Protocol to check if any other host on the network has the same address. The whole process will take around 3 to 4 seconds
+    to complete. Also we need to check and ensure that the gateway has a valid default route entry.
+    */
+    // Note: This check is not strictly necessary and this check could delay the WAN up by 15 seconds in worst case. If the IPv6 address (IANA) is obtained via DHCPv6, and the DHCP client already performs the DAD check.
+    // However, it is beneficial to verify that the WAN IPv6 address is auto-calculated from the delegated prefix or via SLAAC.
 
-    for(i=0; i<15; i++) 
+    for(int i=0; i<15; i++) 
     {
         buffer[0] = '\0';
         if(dad_flag == 0) 
         {
-            if ((fp_dad = v_secure_popen("r","ip address show dev %s tentative", IfaceName))) 
+            if ((fp_dad = v_secure_popen("r","ip address show dev %s tentative", p_VirtIf->Name))) 
             {
                 if(fp_dad != NULL) 
                 {
@@ -1098,7 +1075,6 @@ static int checkIpv6LanAddressIsReadyToUse(DML_VIRTUAL_IFACE* p_VirtIf)
                 }
             }
         }
-
         if(dad_flag == 0) 
         {
             sleep(1);
@@ -1122,10 +1098,10 @@ static int checkIpv6LanAddressIsReadyToUse(DML_VIRTUAL_IFACE* p_VirtIf)
         }
     }
 
-    //if DAD failed on LAN bridge, log an ERROR message and continue with the WAN process.
+    //if DAD failed on WAN interface, log an ERROR message and continue with the WAN process.
     if(dad_flag == 0 || route_flag == 0) 
     {
-        CcspTraceError(("%s %d dad_flag[%d] route_flag[%d] Failed \n", __FUNCTION__, __LINE__,dad_flag,route_flag));
+        CcspTraceError(("%s %d dad_flag[%s] route_flag[%s] Failed \n", __FUNCTION__, __LINE__, dad_flag ? "SUCCESS" : "FAILED", route_flag ? "SUCCESS" : "FAILED"));
     }
 
     if(route_flag == 0)
@@ -1627,8 +1603,9 @@ static int wan_tearDownIPv6(WanMgr_IfaceSM_Controller_t * pWanIfaceCtrl)
         }
     }
 #endif
+
     /** Unconfig IPv6. */
-    if ( WanManager_Ipv6PrefixUtil(p_VirtIf->Name, DEL_ADDR,0,0) < 0)
+    if ( WanManager_Ipv6AddrUtil(p_VirtIf, DEL_ADDR) < 0)
     {
         AnscTraceError(("%s %d -  Failed to remove inactive address \n", __FUNCTION__,__LINE__));
     }
@@ -1661,6 +1638,7 @@ static int wan_tearDownIPv6(WanMgr_IfaceSM_Controller_t * pWanIfaceCtrl)
     sysevent_set(sysevent_fd, sysevent_token, SYSEVENT_FIREWALL_RESTART, NULL, 0);
 
 //RBUS_WAN_IP
+//TODO : **************************** Check this ************************
 #if defined (RBUS_WAN_IP)
 #if defined(_RDKB_GLOBAL_PRODUCT_REQ_)
     unsigned char ConfigureWANIPv6OnLANBridgeSupport = FALSE;
@@ -1869,14 +1847,14 @@ static ANSC_STATUS WanMgr_SendMsgTo_ConnectivityCheck(WanMgr_IfaceSM_Controller_
                     //Restarting firewall to add IPOE_HEALTH_CHECK firewall rules.
                     sysevent_set(sysevent_fd, sysevent_token, SYSEVENT_FIREWALL_RESTART, NULL, 0);
                 }
-                WanMgr_SendMsgToIHC(IPOE_MSG_WAN_CONNECTION_UP, p_VirtIf->Name);
+                WanMgr_SendMsgToIHC(IPOE_MSG_WAN_CONNECTION_UP, p_VirtIf);
                 pWanIfaceCtrl->IhcV4Status = IHC_STARTED;
             }
         }
         else if(type == CONNECTION_MSG_IPV4 && ConnStatus == FALSE)
         {
                 CcspTraceInfo(("%s %d Sending IPOE_MSG_WAN_CONNECTION_DOWN \n", __FUNCTION__, __LINE__));
-                WanMgr_SendMsgToIHC(IPOE_MSG_WAN_CONNECTION_DOWN, p_VirtIf->Name);
+                WanMgr_SendMsgToIHC(IPOE_MSG_WAN_CONNECTION_DOWN, p_VirtIf);
                 pWanIfaceCtrl->IhcV4Status = IHC_STOPPED;
         }
         else if(type == CONNECTION_MSG_IPV6 && ConnStatus == TRUE)
@@ -1892,14 +1870,14 @@ static ANSC_STATUS WanMgr_SendMsgTo_ConnectivityCheck(WanMgr_IfaceSM_Controller_
                     //Restarting firewall to add IPOE_HEALTH_CHECK firewall rules.
                     sysevent_set(sysevent_fd, sysevent_token, SYSEVENT_FIREWALL_RESTART, NULL, 0);
                 }
-               WanMgr_SendMsgToIHC(IPOE_MSG_WAN_CONNECTION_IPV6_UP, p_VirtIf->Name);
+               WanMgr_SendMsgToIHC(IPOE_MSG_WAN_CONNECTION_IPV6_UP, p_VirtIf);
                pWanIfaceCtrl->IhcV6Status = IHC_STARTED;
             }
         }
         else if(type == CONNECTION_MSG_IPV6 && ConnStatus == FALSE)
         {
                 CcspTraceInfo(("%s %d Sending IPOE_MSG_WAN_CONNECTION_IPV6_DOWN \n", __FUNCTION__, __LINE__));
-                WanMgr_SendMsgToIHC(IPOE_MSG_WAN_CONNECTION_IPV6_DOWN, p_VirtIf->Name);
+                WanMgr_SendMsgToIHC(IPOE_MSG_WAN_CONNECTION_IPV6_DOWN, p_VirtIf);
                 pWanIfaceCtrl->IhcV6Status = IHC_STOPPED;
         }
 
@@ -2753,7 +2731,6 @@ static eWanState_t wan_transition_ipv6_down(WanMgr_IfaceSM_Controller_t* pWanIfa
     WanMgr_Rbus_EventPublishHandler(param_name, "", RBUS_STRING);
     snprintf(param_name, sizeof(param_name), "Device.X_RDK_WanManager.Interface.%d.VirtualInterface.%d.IP.IPv6Prefix",  p_VirtIf->baseIfIdx+1, p_VirtIf->VirIfIdx+1);
     WanMgr_Rbus_EventPublishHandler(param_name, "", RBUS_STRING);
-    WanManager_UpdateInterfaceStatus (p_VirtIf, WANMGR_IFACE_CONNECTION_IPV6_DOWN);
 
     //Disable accept_ra
     WanMgr_Configure_accept_ra(p_VirtIf, FALSE);
@@ -2775,6 +2752,16 @@ static eWanState_t wan_transition_ipv6_down(WanMgr_IfaceSM_Controller_t* pWanIfa
         }
     }
 
+    WanManager_UpdateInterfaceStatus (p_VirtIf, WANMGR_IFACE_CONNECTION_IPV6_DOWN);
+    //clear IPv6 lease from the interface data
+    memset(&(p_VirtIf->IP.Ipv6Data), 0, sizeof(WANMGR_IPV6_DATA));
+    if (p_VirtIf->IP.pIpcIpv6Data != NULL )
+    {
+        //free memory
+        free(p_VirtIf->IP.pIpcIpv6Data);
+        p_VirtIf->IP.pIpcIpv6Data = NULL;
+    }
+
 #if defined(FEATURE_464XLAT)
 	xlat_status = xlat_state_get();
 	if(xlat_status == XLAT_ON)
@@ -3649,7 +3636,7 @@ static eWanState_t wan_state_obtaining_ip_addresses(WanMgr_IfaceSM_Controller_t*
                 p_VirtIf->IP.Ipv6Changed = FALSE;
                 return WAN_STATE_OBTAINING_IP_ADDRESSES;
             }
-            if (checkIpv6LanAddressIsReadyToUse(p_VirtIf) == RETURN_OK)
+            if (checkIpv6AddressIsReadyToUse(p_VirtIf) == RETURN_OK)
             {
                 return wan_transition_ipv6_up(pWanIfaceCtrl);
             }
@@ -3720,7 +3707,7 @@ static eWanState_t wan_state_standby(WanMgr_IfaceSM_Controller_t* pWanIfaceCtrl)
                 }
                 p_VirtIf->IP.Ipv6Changed = FALSE;
             }
-            if (checkIpv6LanAddressIsReadyToUse(p_VirtIf) == RETURN_OK)
+            if (checkIpv6AddressIsReadyToUse(p_VirtIf) == RETURN_OK)
             {
                 ret = wan_transition_ipv6_up(pWanIfaceCtrl);
                 CcspTraceInfo((" %s %d - IPv6 Address Assigned to Bridge Yet.\n", __FUNCTION__, __LINE__));
@@ -3823,7 +3810,7 @@ static eWanState_t wan_state_ipv4_leased(WanMgr_IfaceSM_Controller_t* pWanIfaceC
             p_VirtIf->IP.Ipv6Changed = FALSE;
             return WAN_STATE_IPV4_LEASED;
         }
-        if (checkIpv6LanAddressIsReadyToUse(p_VirtIf) == RETURN_OK)
+        if (checkIpv6AddressIsReadyToUse(p_VirtIf) == RETURN_OK)
         {
             return wan_transition_ipv6_up(pWanIfaceCtrl);
         }
@@ -3931,7 +3918,7 @@ static eWanState_t wan_state_ipv6_leased(WanMgr_IfaceSM_Controller_t* pWanIfaceC
     }
 #if defined(FEATURE_MAPT) || defined(FEATURE_SUPPORT_MAPT_NAT46) || defined(FEATURE_MAPE)
     else if (pInterface->Selection.Status == WAN_IFACE_ACTIVE &&
-             ((p_VirtIf->EnableMAPT == TRUE && p_VirtIf->MAP.MaptStatus == WAN_IFACE_MAPT_STATE_UP && checkIpv6LanAddressIsReadyToUse(p_VirtIf) ==RETURN_OK)
+             ((p_VirtIf->EnableMAPT == TRUE && p_VirtIf->MAP.MaptStatus == WAN_IFACE_MAPT_STATE_UP && checkIpv6AddressIsReadyToUse(p_VirtIf) ==RETURN_OK)
               || (p_VirtIf->MAP.dhcp6cMAPparameters.mapType == MAP_TYPE_MAPE && p_VirtIf->Status == WAN_IFACE_STATUS_UP && p_VirtIf->MAP.MapeStatus == WAN_IFACE_MAPE_STATE_UP)))
     {
         CcspTraceInfo(("%s %d - calling wan_transition_map_up \n", __FUNCTION__, __LINE__));
@@ -3960,18 +3947,6 @@ static eWanState_t wan_state_ipv6_leased(WanMgr_IfaceSM_Controller_t* pWanIfaceC
 
     WanMgr_CheckDefaultRA(p_VirtIf);
 
-#if defined(FEATURE_IPOE_HEALTH_CHECK) && defined(IPOE_HEALTH_CHECK_LAN_SYNC_SUPPORT)
-    if(lanState == LAN_STATE_STOPPED)
-    {
-        WanMgr_SendMsgTo_ConnectivityCheck(pWanIfaceCtrl, CONNECTION_MSG_IPV6 , FALSE);
-        lanState = LAN_STATE_RESET;
-    }
-    else if(lanState == LAN_STATE_STARTED)
-    {
-        WanMgr_SendMsgTo_ConnectivityCheck(pWanIfaceCtrl, CONNECTION_MSG_IPV6 , TRUE);
-        lanState = LAN_STATE_RESET;
-    }
-#endif
     return WAN_STATE_IPV6_LEASED;
 }
 
@@ -4070,7 +4045,7 @@ static eWanState_t wan_state_dual_stack_active(WanMgr_IfaceSM_Controller_t* pWan
     }
 #if defined(FEATURE_MAPT) || defined(FEATURE_SUPPORT_MAPT_NAT46) || defined(FEATURE_MAPE)
     else if (pInterface->Selection.Status == WAN_IFACE_ACTIVE &&
-             ((p_VirtIf->EnableMAPT == TRUE && p_VirtIf->MAP.MaptStatus == WAN_IFACE_MAPT_STATE_UP && checkIpv6LanAddressIsReadyToUse(p_VirtIf) ==RETURN_OK)
+             ((p_VirtIf->EnableMAPT == TRUE && p_VirtIf->MAP.MaptStatus == WAN_IFACE_MAPT_STATE_UP && checkIpv6AddressIsReadyToUse(p_VirtIf) ==RETURN_OK)
               || (p_VirtIf->MAP.dhcp6cMAPparameters.mapType == MAP_TYPE_MAPE && p_VirtIf->Status == WAN_IFACE_STATUS_UP && p_VirtIf->MAP.MapeStatus == WAN_IFACE_MAPE_STATE_UP)))
     {
         CcspTraceInfo(("%s %d - calling wan_transition_map_up \n", __FUNCTION__, __LINE__));
@@ -4106,18 +4081,6 @@ static eWanState_t wan_state_dual_stack_active(WanMgr_IfaceSM_Controller_t* pWan
     WanMgr_MonitorDhcpApps(pWanIfaceCtrl);
     WanMgr_CheckDefaultRA(p_VirtIf);
 
-#if defined(FEATURE_IPOE_HEALTH_CHECK) && defined(IPOE_HEALTH_CHECK_LAN_SYNC_SUPPORT)
-    if(lanState == LAN_STATE_STOPPED)
-    {
-        WanMgr_SendMsgTo_ConnectivityCheck(pWanIfaceCtrl, CONNECTION_MSG_IPV6 , FALSE);
-        lanState = LAN_STATE_RESET;
-    }
-    else if(lanState == LAN_STATE_STARTED)
-    {
-        WanMgr_SendMsgTo_ConnectivityCheck(pWanIfaceCtrl, CONNECTION_MSG_IPV6 , TRUE);
-        lanState = LAN_STATE_RESET;
-    }
-#endif
     return WAN_STATE_DUAL_STACK_ACTIVE;
 }
 
@@ -4262,18 +4225,7 @@ static eWanState_t wan_state_map_active(WanMgr_IfaceSM_Controller_t* pWanIfaceCt
     WanMgr_MonitorDhcpApps(pWanIfaceCtrl);
 
     WanMgr_CheckDefaultRA(p_VirtIf);
-#if defined(FEATURE_IPOE_HEALTH_CHECK) && defined(IPOE_HEALTH_CHECK_LAN_SYNC_SUPPORT)
-    if(lanState == LAN_STATE_STOPPED)
-    {
-        WanMgr_SendMsgTo_ConnectivityCheck(pWanIfaceCtrl, CONNECTION_MSG_IPV6 , FALSE);
-        lanState = LAN_STATE_RESET;
-    }
-    else if(lanState == LAN_STATE_STARTED)
-    {
-        WanMgr_SendMsgTo_ConnectivityCheck(pWanIfaceCtrl, CONNECTION_MSG_IPV6 , TRUE);
-        lanState = LAN_STATE_RESET;
-    }
-#endif
+
     return WAN_STATE_MAP_ACTIVE;
 }