X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=945eca17b0d6243953589268ab6a7c6552b5f1bc;hp=29924c11700786aff0c21231c14f2fef25eb0c6e;hb=5fbd904e5b4ed87243c09c86adcfb17ae93aa4f5;hpb=edc15caac6c6d3b2d8ea17f98ecbaba81ba573dc

diff --git a/ubus.c b/ubus.c
index 29924c1..945eca1 100644
--- a/ubus.c
+++ b/ubus.c
@@ -44,8 +44,10 @@ netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj,
 		     struct ubus_request_data *req, const char *method,
 		     struct blob_attr *msg)
 {
-	netifd_reload();
-	return 0;
+	if (netifd_reload())
+		return UBUS_STATUS_UNKNOWN_ERROR;
+
+	return UBUS_STATUS_OK;
 }
 
 enum {
@@ -402,8 +404,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 +487,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 +620,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 +637,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 +700,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);