interface-ip: set prefix indicator flag when IPv6 prefix lifetime changes

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 29924c1..1b1a4cd 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -402,8 +402,7 @@ netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
 }
 
 static void
-interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6,
-                               bool enabled)
+interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6, bool enabled)
 {
        struct device_addr *addr;
        char *buf;
@@ -486,6 +485,9 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
                if (route->flags & DEVROUTE_TYPE)
                        blobmsg_add_u32(&b, "type", route->type);
 
+               if (route->flags & DEVROUTE_PROTO)
+                       blobmsg_add_u32(&b, "proto", route->proto);
+
                if (route->flags & DEVROUTE_MTU)
                        blobmsg_add_u32(&b, "mtu", route->mtu);
 
@@ -616,8 +618,7 @@ interface_ip_dump_prefix_assignment_list(struct interface *iface)
 }
 
 static void
-interface_ip_dump_dns_server_list(struct interface_ip_settings *ip,
-                                  bool enabled)
+interface_ip_dump_dns_server_list(struct interface_ip_settings *ip, bool enabled)
 {
        struct dns_server *dns;
        int buflen = 128;
@@ -634,8 +635,7 @@ interface_ip_dump_dns_server_list(struct interface_ip_settings *ip,
 }
 
 static void
-interface_ip_dump_dns_search_list(struct interface_ip_settings *ip,
-                                  bool enabled)
+interface_ip_dump_dns_search_list(struct interface_ip_settings *ip, bool enabled)
 {
        struct dns_search_domain *dns;
 
@@ -698,6 +698,8 @@ netifd_dump_status(struct interface *iface)
                blobmsg_add_u32(&b, "metric", iface->metric);
                blobmsg_add_u32(&b, "dns_metric", iface->dns_metric);
                blobmsg_add_u8(&b, "delegation", !iface->proto_ip.no_delegation);
+               if (iface->assignment_weight)
+                       blobmsg_add_u32(&b, "ip6weight", iface->assignment_weight);
                a = blobmsg_open_array(&b, "ipv4-address");
                interface_ip_dump_address_list(&iface->config_ip, false, true);
                interface_ip_dump_address_list(&iface->proto_ip, false, true);