X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=5cb54b1c4271fea569e3dcaf4dfb9a6141ef19a4;hp=794444e8102896173cb42b100d8f0dfe801ba926;hb=52c919d0d38f3b788155de06b929d4e3449e1a72;hpb=e6e1fd184841552bd343ef2b92378c1d84cb79f4

diff --git a/ubus.c b/ubus.c
index 794444e..5cb54b1 100644
--- a/ubus.c
+++ b/ubus.c
@@ -140,7 +140,6 @@ netifd_add_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!iface)
 		return UBUS_STATUS_UNKNOWN_ERROR;
 
-	interface_set_dynamic(iface);
 	iface->device_config = true;
 
 	config = blob_memdup(msg);
@@ -148,6 +147,7 @@ netifd_add_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
 		goto error;
 
 	interface_add(iface, config);
+	interface_set_dynamic(iface);
 
 	// need to look up the interface name again, in case of config update,
 	iface = vlist_find(&interfaces, name, iface, node);
@@ -463,6 +463,9 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
 		if (route->enabled != enabled)
 			continue;
 
+		if ((ip->no_defaultroute == enabled) && !route->mask)
+			continue;
+
 		if ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
 			af = AF_INET;
 		else
@@ -494,7 +497,7 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
 
 		buf = blobmsg_alloc_string_buffer(&b, "source", buflen);
 		inet_ntop(af, &route->source, buf, buflen);
-		snprintf(buf + strlen(buf), 4, "/%u", route->sourcemask);
+		snprintf(buf + strlen(buf), buflen - strlen(buf), "/%u", route->sourcemask);
 		blobmsg_add_string_buffer(&b);
 
 		blobmsg_close_table(&b, r);
@@ -659,6 +662,21 @@ netifd_dump_status(struct interface *iface)
 		blobmsg_add_string(&b, "device", dev->ifname);
 
 	if (iface->state == IFS_UP) {
+		if (iface->updated) {
+			a = blobmsg_open_array(&b, "updated");
+
+			if (iface->updated & IUF_ADDRESS)
+				blobmsg_add_string(&b, NULL, "addresses");
+			if (iface->updated & IUF_ROUTE)
+				blobmsg_add_string(&b, NULL, "routes");
+			if (iface->updated & IUF_PREFIX)
+				blobmsg_add_string(&b, NULL, "prefixes");
+			if (iface->updated & IUF_DATA)
+				blobmsg_add_string(&b, NULL, "data");
+
+			blobmsg_close_array(&b, a);
+		}
+
 		if (iface->ip4table)
 			blobmsg_add_u32(&b, "ip4table", iface->ip4table);
 		if (iface->ip6table)
@@ -719,11 +737,11 @@ netifd_dump_status(struct interface *iface)
 
 	a = blobmsg_open_table(&b, "data");
 	avl_for_each_element(&iface->data, data, node)
-		blob_put(&b, blob_id(data->data), blob_data(data->data), blob_len(data->data));
+		blobmsg_add_blob(&b, data->data);
 
 	blobmsg_close_table(&b, a);
 
-	if (!list_is_empty(&iface->errors))
+	if (!list_empty(&iface->errors))
 		netifd_add_interface_errors(&b, iface);
 }
 
@@ -1046,6 +1064,29 @@ netifd_handle_wdev_status(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static int
+netifd_handle_wdev_get_validate(struct ubus_context *ctx, struct ubus_object *obj,
+			  struct ubus_request_data *req, const char *method,
+			  struct blob_attr *msg)
+{
+	struct wireless_device *wdev;
+	int ret;
+
+	wdev = get_wdev(msg, &ret);
+	if (ret == UBUS_STATUS_NOT_FOUND)
+		return ret;
+
+	blob_buf_init(&b, 0);
+	if (wdev) {
+		wireless_device_get_validate(wdev, &b);
+	} else {
+		vlist_for_each_element(&wireless_devices, wdev, node)
+			wireless_device_get_validate(wdev, &b);
+	}
+	ubus_send_reply(ctx, req, b.head);
+	return 0;
+}
+
+static int
 netifd_handle_wdev_notify(struct ubus_context *ctx, struct ubus_object *obj,
 			  struct ubus_request_data *req, const char *method,
 			  struct blob_attr *msg)
@@ -1065,6 +1106,7 @@ static struct ubus_method wireless_object_methods[] = {
 	{ .name = "down", .handler = netifd_handle_wdev_down },
 	{ .name = "status", .handler = netifd_handle_wdev_status },
 	{ .name = "notify", .handler = netifd_handle_wdev_notify },
+	{ .name = "get_validate", .handler = netifd_handle_wdev_get_validate },
 };
 
 static struct ubus_object_type wireless_object_type =