X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fubus.c;h=e9e2de386e53e170c076b4b413a34c03b2c7ef62;hp=14d0a5f85c12005811041ace76f6dc958d50e715;hb=091d8a94a6b7325309c3354344b96ff37aed52e2;hpb=1fcf0388078c7675187ff4f2f644aaf65138f261

diff --git a/src/ubus.c b/src/ubus.c
index 14d0a5f..e9e2de3 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -34,7 +34,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob
 
 		struct dhcpv4_assignment *lease;
 		list_for_each_entry(lease, &iface->dhcpv4_assignments, head) {
-			if (lease->valid_until < now)
+			if (!INFINITE_VALID(lease->valid_until) && lease->valid_until < now)
 				continue;
 
 			void *l = blobmsg_open_table(&b, NULL);
@@ -50,7 +50,8 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob
 			inet_ntop(AF_INET, &addr, buf, INET_ADDRSTRLEN);
 			blobmsg_add_string_buffer(&b);
 
-			blobmsg_add_u32(&b, "valid", now - lease->valid_until);
+			blobmsg_add_u32(&b, "valid", INFINITE_VALID(lease->valid_until) ?
+						(uint32_t)-1 : (uint32_t)(lease->valid_until - now));
 
 			blobmsg_close_table(&b, l);
 		}
@@ -83,7 +84,7 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct
 
 		struct dhcpv6_assignment *lease;
 		list_for_each_entry(lease, &iface->ia_assignments, head) {
-			if (lease->valid_until < now)
+			if (!INFINITE_VALID(lease->valid_until) && lease->valid_until < now)
 				continue;
 
 			void *l = blobmsg_open_table(&b, NULL);
@@ -115,7 +116,8 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct
 			}
 			blobmsg_close_table(&b, m);
 
-			blobmsg_add_u32(&b, "valid", now - lease->valid_until);
+			blobmsg_add_u32(&b, "valid", INFINITE_VALID(lease->valid_until) ?
+						(uint32_t)-1 : (uint32_t)(lease->valid_until - now));
 
 			blobmsg_close_table(&b, l);
 		}