X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=161fbe777af9148cbff895111dcd443fbf15d188;hp=90636804bb6d61fb45649ddce18bf1114569d03c;hb=3eea8576d48d9b20cc1c6b46f54c7345a39d13aa;hpb=2fe499798dd5c80f0af27cdd53dc52260002c320

diff --git a/ubus.c b/ubus.c
index 9063680..161fbe7 100644
--- a/ubus.c
+++ b/ubus.c
@@ -22,8 +22,9 @@
 #include "proto.h"
 #include "ubus.h"
 #include "system.h"
+#include "wireless.h"
 
-static struct ubus_context *ctx = NULL;
+struct ubus_context *ubus_ctx = NULL;
 static struct blob_buf b;
 static const char *ubus_path;
 
@@ -139,25 +140,25 @@ 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);
 	if (!config)
 		goto error;
 
 	interface_add(iface, config);
 
-	// need to look up the interface name again, in case of config update,
+	// need to look up the interface name again, in case of config update
+	// the pointer will have changed
 	iface = vlist_find(&interfaces, name, iface, node);
 	if (!iface)
 		return UBUS_STATUS_UNKNOWN_ERROR;
 
+	// Set interface as dynamic
+	interface_set_dynamic(iface);
+
 	dev = iface->main_dev.dev;
 	if (!dev || !dev->default_config)
 		return UBUS_STATUS_UNKNOWN_ERROR;
 
-	device_set_config(dev, dev->type, msg);
 	return UBUS_STATUS_OK;
 
 error:
@@ -165,12 +166,38 @@ error:
 	return UBUS_STATUS_UNKNOWN_ERROR;
 }
 
+static int
+netifd_del_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
+		      struct ubus_request_data *req, const char *method,
+		      struct blob_attr *msg)
+{
+	struct blob_attr *tb[__DI_MAX];
+	struct interface *iface;
+
+	blobmsg_parse(dynamic_policy, __DI_MAX, tb, blob_data(msg), blob_len(msg));
+
+	if (!tb[DI_NAME])
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	const char *name = blobmsg_get_string(tb[DI_NAME]);
+	iface = vlist_find(&interfaces, name, iface, node);
+
+	if (!iface)
+		return UBUS_STATUS_NOT_FOUND;
+	else if (!iface->dynamic)
+		return UBUS_STATUS_INVALID_COMMAND;
+
+	vlist_delete(&interfaces, &iface->node);
+	return UBUS_STATUS_OK;
+}
+
 static struct ubus_method main_object_methods[] = {
 	{ .name = "restart", .handler = netifd_handle_restart },
 	{ .name = "reload", .handler = netifd_handle_reload },
 	UBUS_METHOD("add_host_route", netifd_add_host_route, route_policy),
 	{ .name = "get_proto_handlers", .handler = netifd_get_proto_handlers },
 	UBUS_METHOD("add_dynamic", netifd_add_dynamic, dynamic_policy),
+	UBUS_METHOD("del_dynamic", netifd_del_dynamic, dynamic_policy),
 };
 
 static struct ubus_object_type main_object_type =
@@ -319,8 +346,8 @@ static struct ubus_object dev_object = {
 static void
 netifd_ubus_add_fd(void)
 {
-	ubus_add_uloop(ctx);
-	system_fd_set_cloexec(ctx->sock.fd);
+	ubus_add_uloop(ubus_ctx);
+	system_fd_set_cloexec(ubus_ctx->sock.fd);
 }
 
 static void
@@ -331,13 +358,13 @@ netifd_ubus_reconnect_timer(struct uloop_timeout *timeout)
 	};
 	int t = 2;
 
-	if (ubus_reconnect(ctx, ubus_path) != 0) {
+	if (ubus_reconnect(ubus_ctx, ubus_path) != 0) {
 		DPRINTF("failed to reconnect, trying again in %d seconds\n", t);
 		uloop_timeout_set(&retry, t * 1000);
 		return;
 	}
 
-	DPRINTF("reconnected to ubus, new id: %08x\n", ctx->local_id);
+	DPRINTF("reconnected to ubus, new id: %08x\n", ubus_ctx->local_id);
 	netifd_ubus_add_fd();
 }
 
@@ -441,6 +468,9 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6,
 		if (addr->valid_until)
 			blobmsg_add_u32(&b, "valid", addr->valid_until - now);
 
+		if (addr->pclass)
+			blobmsg_add_string(&b, "class", addr->pclass);
+
 		blobmsg_close_table(&b, a);
 	}
 }
@@ -459,6 +489,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
@@ -476,6 +509,9 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
 		inet_ntop(af, &route->nexthop, buf, buflen);
 		blobmsg_add_string_buffer(&b);
 
+		if (route->flags & DEVROUTE_TYPE)
+			blobmsg_add_u32(&b, "type", route->type);
+
 		if (route->flags & DEVROUTE_MTU)
 			blobmsg_add_u32(&b, "mtu", route->mtu);
 
@@ -490,7 +526,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);
@@ -643,7 +679,8 @@ netifd_dump_status(struct interface *iface)
 	if (iface->state == IFS_UP) {
 		time_t cur = system_get_rtime();
 		blobmsg_add_u32(&b, "uptime", cur - iface->start_time);
-		blobmsg_add_string(&b, "l3_device", iface->l3_dev.dev->ifname);
+		if (iface->l3_dev.dev)
+			blobmsg_add_string(&b, "l3_device", iface->l3_dev.dev->ifname);
 	}
 
 	if (iface->proto_handler)
@@ -655,6 +692,25 @@ 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)
+			blobmsg_add_u32(&b, "ip6table", iface->ip6table);		  
 		blobmsg_add_u32(&b, "metric", iface->metric);
 		blobmsg_add_u8(&b, "delegation", !iface->proto_ip.no_delegation);
 		a = blobmsg_open_array(&b, "ipv4-address");
@@ -711,11 +767,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);
 }
 
@@ -756,23 +812,40 @@ netifd_handle_dump(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
+enum {
+	DEV_LINK_NAME,
+	DEV_LINK_EXT,
+	__DEV_LINK_MAX,
+};
+
+static const struct blobmsg_policy dev_link_policy[__DEV_LINK_MAX] = {
+	[DEV_LINK_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
+	[DEV_LINK_EXT] = { .name = "link-ext", .type = BLOBMSG_TYPE_BOOL },
+};
+
 static int
 netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 			   struct ubus_request_data *req, const char *method,
 			   struct blob_attr *msg)
 {
-	struct blob_attr *tb[__DEV_MAX];
+	struct blob_attr *tb[__DEV_LINK_MAX];
+	struct blob_attr *cur;
 	struct interface *iface;
 	bool add = !strncmp(method, "add", 3);
+	bool link_ext = true;
 
 	iface = container_of(obj, struct interface, ubus);
 
-	blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(dev_link_policy, __DEV_LINK_MAX, tb, blob_data(msg), blob_len(msg));
 
-	if (!tb[DEV_NAME])
+	if (!tb[DEV_LINK_NAME])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	return interface_handle_link(iface, blobmsg_data(tb[DEV_NAME]), add);
+	cur = tb[DEV_LINK_EXT];
+	if (cur)
+		link_ext = !!blobmsg_get_u8(cur);
+
+	return interface_handle_link(iface, blobmsg_data(tb[DEV_LINK_NAME]), add, link_ext);
 }
 
 
@@ -863,8 +936,8 @@ static struct ubus_method iface_object_methods[] = {
 	{ .name = "status", .handler = netifd_handle_status },
 	{ .name = "prepare", .handler = netifd_handle_iface_prepare },
 	{ .name = "dump", .handler = netifd_handle_dump },
-	UBUS_METHOD("add_device", netifd_iface_handle_device, dev_policy ),
-	UBUS_METHOD("remove_device", netifd_iface_handle_device, dev_policy ),
+	UBUS_METHOD("add_device", netifd_iface_handle_device, dev_link_policy ),
+	UBUS_METHOD("remove_device", netifd_iface_handle_device, dev_link_policy ),
 	{ .name = "notify_proto", .handler = netifd_iface_notify_proto },
 	{ .name = "remove", .handler = netifd_iface_remove },
 	{ .name = "set_data", .handler = netifd_handle_set_data },
@@ -882,7 +955,7 @@ static struct ubus_object iface_object = {
 
 static void netifd_add_object(struct ubus_object *obj)
 {
-	int ret = ubus_add_object(ctx, obj);
+	int ret = ubus_add_object(ubus_ctx, obj);
 
 	if (ret != 0)
 		fprintf(stderr, "Failed to publish object '%s': %s\n", obj->name, ubus_strerror(ret));
@@ -943,22 +1016,174 @@ static void netifd_add_iface_object(void)
 	netifd_add_object(&iface_object);
 }
 
+static struct wireless_device *
+get_wdev(struct blob_attr *msg, int *ret)
+{
+	struct blobmsg_policy wdev_policy = {
+		.name = "device",
+		.type = BLOBMSG_TYPE_STRING,
+	};
+	struct blob_attr *dev_attr;
+	struct wireless_device *wdev = NULL;
+
+
+	blobmsg_parse(&wdev_policy, 1, &dev_attr, blob_data(msg), blob_len(msg));
+	if (!dev_attr) {
+		*ret = UBUS_STATUS_INVALID_ARGUMENT;
+		return NULL;
+	}
+
+	wdev = vlist_find(&wireless_devices, blobmsg_data(dev_attr), wdev, node);
+	if (!wdev) {
+		*ret = UBUS_STATUS_NOT_FOUND;
+		return NULL;
+	}
+
+	*ret = 0;
+	return wdev;
+}
+
+static int
+netifd_handle_wdev_up(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;
+
+	if (wdev) {
+		wireless_device_set_up(wdev);
+	} else {
+		vlist_for_each_element(&wireless_devices, wdev, node)
+			wireless_device_set_up(wdev);
+	}
+
+	return 0;
+}
+
+static int
+netifd_handle_wdev_down(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;
+
+	if (wdev) {
+		wireless_device_set_down(wdev);
+	} else {
+		vlist_for_each_element(&wireless_devices, wdev, node)
+			wireless_device_set_down(wdev);
+	}
+
+	return 0;
+}
+
+static int
+netifd_handle_wdev_status(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_status(wdev, &b);
+	} else {
+		vlist_for_each_element(&wireless_devices, wdev, node)
+			wireless_device_status(wdev, &b);
+	}
+	ubus_send_reply(ctx, req, b.head);
+	return 0;
+}
+
+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)
+{
+	struct wireless_device *wdev;
+	int ret;
+
+	wdev = get_wdev(msg, &ret);
+	if (!wdev)
+		return ret;
+
+	return wireless_device_notify(wdev, msg, req);
+}
+
+static struct ubus_method wireless_object_methods[] = {
+	{ .name = "up", .handler = netifd_handle_wdev_up },
+	{ .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 =
+	UBUS_OBJECT_TYPE("netifd_iface", wireless_object_methods);
+
+
+static struct ubus_object wireless_object = {
+	.name = "network.wireless",
+	.type = &wireless_object_type,
+	.methods = wireless_object_methods,
+	.n_methods = ARRAY_SIZE(wireless_object_methods),
+};
+
 int
 netifd_ubus_init(const char *path)
 {
 	uloop_init();
 	ubus_path = path;
 
-	ctx = ubus_connect(path);
-	if (!ctx)
+	ubus_ctx = ubus_connect(path);
+	if (!ubus_ctx)
 		return -EIO;
 
-	DPRINTF("connected as %08x\n", ctx->local_id);
-	ctx->connection_lost = netifd_ubus_connection_lost;
+	DPRINTF("connected as %08x\n", ubus_ctx->local_id);
+	ubus_ctx->connection_lost = netifd_ubus_connection_lost;
 	netifd_ubus_add_fd();
 
 	netifd_add_object(&main_object);
 	netifd_add_object(&dev_object);
+	netifd_add_object(&wireless_object);
 	netifd_add_iface_object();
 
 	return 0;
@@ -967,7 +1192,7 @@ netifd_ubus_init(const char *path)
 void
 netifd_ubus_done(void)
 {
-	ubus_free(ctx);
+	ubus_free(ubus_ctx);
 }
 
 void
@@ -976,18 +1201,18 @@ netifd_ubus_interface_event(struct interface *iface, bool up)
 	blob_buf_init(&b, 0);
 	blobmsg_add_string(&b, "action", up ? "ifup" : "ifdown");
 	blobmsg_add_string(&b, "interface", iface->name);
-	ubus_send_event(ctx, "network.interface", b.head);
+	ubus_send_event(ubus_ctx, "network.interface", b.head);
 }
 
 void
 netifd_ubus_interface_notify(struct interface *iface, bool up)
 {
-	const char *event = (up) ? "update" : "down";
+	const char *event = (up) ? "interface.update" : "interface.down";
 	blob_buf_init(&b, 0);
 	blobmsg_add_string(&b, "interface", iface->name);
 	netifd_dump_status(iface);
-	ubus_notify(ctx, &iface_object, event, b.head, -1);
-	ubus_notify(ctx, &iface->ubus, event, b.head, -1);
+	ubus_notify(ubus_ctx, &iface_object, event, b.head, -1);
+	ubus_notify(ubus_ctx, &iface->ubus, event, b.head, -1);
 }
 
 void
@@ -1003,7 +1228,7 @@ netifd_ubus_add_interface(struct interface *iface)
 	obj->type = &iface_object_type;
 	obj->methods = iface_object_methods;
 	obj->n_methods = ARRAY_SIZE(iface_object_methods);
-	if (ubus_add_object(ctx, &iface->ubus)) {
+	if (ubus_add_object(ubus_ctx, &iface->ubus)) {
 		DPRINTF("failed to publish ubus object for interface '%s'\n", iface->name);
 		free(name);
 		obj->name = NULL;
@@ -1016,6 +1241,6 @@ netifd_ubus_remove_interface(struct interface *iface)
 	if (!iface->ubus.name)
 		return;
 
-	ubus_remove_object(ctx, &iface->ubus);
+	ubus_remove_object(ubus_ctx, &iface->ubus);
 	free((void *) iface->ubus.name);
 }