Fix ubus valid parameter being displayed as a negative number;
also display infinite lifetime as INT32_MAX
Signed-off-by: Hans Dedecker <dedec...@gmail.com>
---
src/ubus.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/ubus.c b/src/ubus.c
index 14d0a5f..425abe4 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) ?
+ INT32_MAX :
(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) ?
+ INT32_MAX :
(uint32_t)(lease->valid_until - now));
blobmsg_close_table(&b, l);
}
--
1.9.1
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
