X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubus.c;h=0123b17e62a5bad6cc69f0e5f9a999355a0d6dd4;hb=650758b16e5185505a3fbc1307949340af70b611;hp=56f7bddd06c56048b539b2b7ddfe68ccbca4bc2d;hpb=8795f9ef89626cd658f615c78c6a17e990c0dcaa;p=project%2Fnetifd.git

diff --git a/ubus.c b/ubus.c
index 56f7bdd..0123b17 100644
--- a/ubus.c
+++ b/ubus.c
@@ -204,7 +204,7 @@ netifd_dev_status(struct ubus_context *ctx, struct ubus_object *obj,
 	blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
 
 	if (tb[DEV_NAME]) {
-		dev = device_get(blobmsg_data(tb[DEV_NAME]), false);
+		dev = device_find(blobmsg_data(tb[DEV_NAME]));
 		if (!dev)
 			return UBUS_STATUS_INVALID_ARGUMENT;
 	}
@@ -290,7 +290,7 @@ netifd_handle_set_state(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!cur)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	dev = device_get(blobmsg_data(cur), false);
+	dev = device_find(blobmsg_data(cur));
 	if (!dev)
 		return UBUS_STATUS_NOT_FOUND;
 
@@ -486,6 +486,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);
 
@@ -600,12 +603,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)
@@ -649,6 +661,7 @@ netifd_dump_status(struct interface *iface)
 	blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP);
 	blobmsg_add_u8(&b, "available", iface->available);
 	blobmsg_add_u8(&b, "autostart", iface->autostart);
+	blobmsg_add_u8(&b, "dynamic", iface->dynamic);
 
 	if (iface->state == IFS_UP) {
 		time_t cur = system_get_rtime();
@@ -684,8 +697,9 @@ netifd_dump_status(struct interface *iface)
 		if (iface->ip4table)
 			blobmsg_add_u32(&b, "ip4table", iface->ip4table);
 		if (iface->ip6table)
-			blobmsg_add_u32(&b, "ip6table", iface->ip6table);		  
+			blobmsg_add_u32(&b, "ip6table", iface->ip6table);
 		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);
 		a = blobmsg_open_array(&b, "ipv4-address");
 		interface_ip_dump_address_list(&iface->config_ip, false, true);
@@ -817,7 +831,7 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 
 	cur = tb[DEV_LINK_EXT];
 	if (cur)
-		link_ext = !!blobmsg_get_u8(cur);
+		link_ext = blobmsg_get_bool(cur);
 
 	return interface_handle_link(iface, blobmsg_data(tb[DEV_LINK_NAME]), add, link_ext);
 }
@@ -890,18 +904,10 @@ netifd_handle_set_data(struct ubus_context *ctx, struct ubus_object *obj,
 		       struct blob_attr *msg)
 {
 	struct interface *iface;
-	struct blob_attr *cur;
-	int rem, ret;
 
 	iface = container_of(obj, struct interface, ubus);
 
-	blob_for_each_attr(cur, msg, rem) {
-		ret = interface_add_data(iface, cur);
-		if (ret)
-			return ret;
-	}
-
-	return 0;
+	return interface_parse_data(iface, msg);
 }
 
 static struct ubus_method iface_object_methods[] = {
@@ -976,6 +982,9 @@ static void netifd_add_iface_object(void)
 	int i;
 
 	methods = calloc(1, sizeof(iface_object_methods));
+	if (!methods)
+		return;
+
 	memcpy(methods, iface_object_methods, sizeof(iface_object_methods));
 	iface_object.methods = methods;