From 373495ad610cfffaeac833283d1431e6328a109a Mon Sep 17 00:00:00 2001 From: Mislav Novakovic Date: Mon, 21 May 2018 18:07:38 +0200 Subject: [PATCH] ubus: fix invalid ipv6-prefix json "ipv6-prefix": [ { "", "preferred-lifetime": 37979, "valid-lifetime": 48779, "prefix-length": 63 } ], json object is missing key, set address as key name. Line up DHCPv4 lease json info by using key name "address" Signed-off-by: Mislav Novakovic Signed-off-by: Hans Dedecker --- src/ubus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubus.c b/src/ubus.c index 6af5911..973ae5a 100644 --- a/src/ubus.c +++ b/src/ubus.c @@ -55,7 +55,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob blobmsg_add_string(&b, NULL, "static"); blobmsg_close_array(&b, m); - buf = blobmsg_alloc_string_buffer(&b, "ip", INET_ADDRSTRLEN); + buf = blobmsg_alloc_string_buffer(&b, "address", INET_ADDRSTRLEN); struct in_addr addr = {.s_addr = c->addr}; inet_ntop(AF_INET, &addr, buf, INET_ADDRSTRLEN); blobmsg_add_string_buffer(&b); @@ -80,7 +80,7 @@ static void dhcpv6_blobmsg_ia_addr(struct in6_addr *addr, int prefix, uint32_t p uint32_t valid, _unused void *arg) { void *a = blobmsg_open_table(&b, NULL); - char *buf = blobmsg_alloc_string_buffer(&b, NULL, INET6_ADDRSTRLEN); + char *buf = blobmsg_alloc_string_buffer(&b, "address", INET6_ADDRSTRLEN); inet_ntop(AF_INET6, addr, buf, INET6_ADDRSTRLEN); blobmsg_add_string_buffer(&b); -- 2.30.2