SHARMAN-2786:DHCP Lease Expire Time (ipv4) is not getting updated in …

…GUI>Network page Reason for change:DHCP Lease Expire Time (ipv4) is not getting updated in GUI>Network page Test Procedure: 1.)Test DHCP v4 Remaining Lease on GUI. Risks: Medium Priority: P2 Signed-off-by: kulvendra singh <[email protected]>
rdkcentral · Oct 22, 2024 · e46ccd9 · e46ccd9
1 parent f3db8e7
commit e46ccd9
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/source/WanManager/wanmgr_dhcpv4_apis.c b/source/WanManager/wanmgr_dhcpv4_apis.c
@@ -67,7 +67,9 @@ extern char g_Subsystem[32];
 
 #define P2P_SUB_NET_MASK   "255.255.255.255"
 #define DHCP_STATE_UP      "Up"
+#define DHCP_STATE_RENEW   "renew"
 #define DHCP_STATE_DOWN    "Down"
+#define DHCP_STATE_BOUND   "bound"
 
 static ANSC_STATUS wanmgr_dchpv4_get_ipc_msg_info(WANMGR_IPV4_DATA* pDhcpv4Data, ipc_dhcpv4_data_t* pIpcIpv4Data)
 {
@@ -918,6 +920,10 @@ WanMgr_DmlDhcpcGetInfo
 {
     UNREFERENCED_PARAMETER(hContext);
     ANSC_STATUS  rc;
+    char name[BUFLEN_64] = {0};
+    char value[BUFLEN_64] = {0};
+    uint32_t up_time = 0;
+    uint32_t start_time = 0;
 
     if ( (!pInfo) || (ulInstanceNumber != 1) ){
         return ANSC_STATUS_FAILURE;
@@ -933,9 +939,19 @@ WanMgr_DmlDhcpcGetInfo
         pInfo->IPRouters[0].Value  = inet_addr(p_VirtIf->IP.Ipv4Data.gateway);
         pInfo->DNSServers[0].Value = inet_addr(p_VirtIf->IP.Ipv4Data.dnsServer);
         pInfo->DNSServers[1].Value = inet_addr(p_VirtIf->IP.Ipv4Data.dnsServer1);
-        pInfo->DHCPStatus          = (strcmp(p_VirtIf->IP.Ipv4Data.dhcpState, DHCP_STATE_UP) == 0) ? DML_DHCPC_STATUS_Bound : DML_DHCPC_STATUS_Init;
+        pInfo->DHCPServer.Value = inet_addr(p_VirtIf->IP.Ipv4Data.dhcpServerId);
+	pInfo->DHCPStatus = ((strcmp(p_VirtIf->IP.Ipv4Data.dhcpState, DHCP_STATE_BOUND) == 0) || 
+                       (strcmp(p_VirtIf->IP.Ipv4Data.dhcpState, DHCP_STATE_RENEW) == 0)) ? DML_DHCPC_STATUS_Bound : DML_DHCPC_STATUS_Init;
+
+        snprintf(name,sizeof(name),SYSEVENT_IPV4_START_TIME,p_VirtIf->IP.Ipv4Data.ifname);
+        up_time = WanManager_getUpTime();
+        sysevent_get(sysevent_fd, sysevent_token, name, value, sizeof(value));
+        start_time = atoi(value);
+
+        pInfo->LeaseTimeRemaining = p_VirtIf->IP.Ipv4Data.leaseTime - (up_time - start_time);
         WanMgrDml_GetIfaceData_release(NULL);
     }
+
     pInfo->NumDnsServers = 2;
     pInfo->NumIPRouters = 1;
     return ANSC_STATUS_SUCCESS;