rdkcentral · S-Parthiban-Selvaraj · Jul 16, 2024 · Jul 16, 2024 · Jul 17, 2024 · Jul 22, 2024
@@ -366,14 +366,12 @@ typedef struct _WANMGR_IPV6_DATA
    uint32_t prefixVltime;
    char sitePrefixOld[BUFLEN_48]; /**< add support for RFC7084 requirement L-13 */
     uint32_t ipv6_TimeOffset;
-   #if defined(FEATURE_RDKB_CONFIGURABLE_WAN_INTERFACE)
    /* Params to store the IPv6 IPC message */
-   bool addrAssigned;
+   bool addrAssigned;           /**< Have we been assigned an IPv6 address ? */
    uint32_t addrCmd;
-   bool prefixAssigned;  /**< Have we been assigned a site prefix ? */
+   bool prefixAssigned;         /**< Have we been assigned a site prefix ? */
    uint32_t prefixCmd;
    bool domainNameAssigned;     /**< Have we been assigned dns server addresses ? */
-   #endif
 } WANMGR_IPV6_DATA;
 
 typedef struct _WANMGR_IPV6_RA_DATA 

@@ -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);

@@ -733,14 +733,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[] = {

@@ -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 ...
-         * We can use the received IAPD to construct a Ipv6 /128 address which can be used for managerment and voice ...
+         * We can use the received IAPD to construct a Ipv6 /128 address which can be used for management and voice ...
-         * We can use the received IAPD to construct a Ipv6 /128 address which can be used for managerment and voice ...
+         * We can use the received IAPD to construct a Ipv6 /128 address which can be used for management 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);
+    }
+
-    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. Canculate 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);
-    }
-    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. Canculate 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);
-    }
 }
 
 /*
@@ -209,7 +220,7 @@ void WanMgr_ProcessDhcpClientEvent(DhcpEventThreadArgs *eventData)
                     //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));