From: Hans Dedecker Date: Fri, 9 Dec 2016 07:47:39 +0000 (+0100) Subject: ubus: Display the IPv6 prefix assigned address X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=edc15caac6c6d3b2d8ea17f98ecbaba81ba573dc;ds=sidebyside ubus: Display the IPv6 prefix assigned address Display the IPv6 address obtained from a prefix assignment as local-address element in the ubus ipv6-prefix-assignment list so it's explicitly clear which IPv6 address from the delegated prefix is assigned to interface. Signed-off-by: Hans Dedecker --- diff --git a/ubus.c b/ubus.c index 8ba43c0..29924c1 100644 --- a/ubus.c +++ b/ubus.c @@ -600,12 +600,21 @@ interface_ip_dump_prefix_assignment_list(struct interface *iface) if (prefix->valid_until) blobmsg_add_u32(&b, "valid", prefix->valid_until - now); + void *c = blobmsg_open_table(&b, "local-address"); + if (assign->enabled) { + buf = blobmsg_alloc_string_buffer(&b, "address", buflen); + inet_ntop(AF_INET6, &assign->addr, buf, buflen); + blobmsg_add_string_buffer(&b); + + blobmsg_add_u32(&b, "mask", assign->length < 64 ? 64 : assign->length); + } + blobmsg_close_table(&b, c); + blobmsg_close_table(&b, a); } } } - static void interface_ip_dump_dns_server_list(struct interface_ip_settings *ip, bool enabled)