X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=014a34eac3420dbd891a6b0335778c5ce6add128;hp=c47f459be47a50ebb1cd143ed592f9820417cb40;hb=75baeca6f817b161f522a9961bfe5c3718397189;hpb=6b3f6f4466e5584f2bdefc55b3ca34186b65acb9

diff --git a/ubus.c b/ubus.c
index c47f459..014a34e 100644
--- a/ubus.c
+++ b/ubus.c
@@ -80,8 +80,57 @@ netifd_dev_status(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
+enum {
+	ALIAS_ATTR_ALIAS,
+	ALIAS_ATTR_DEV,
+	__ALIAS_ATTR_MAX,
+};
+
+static const struct blobmsg_policy alias_attrs[__ALIAS_ATTR_MAX] = {
+	[ALIAS_ATTR_ALIAS] = { "alias", BLOBMSG_TYPE_ARRAY },
+	[ALIAS_ATTR_DEV] = { "device", BLOBMSG_TYPE_STRING },
+};
+
+static int
+netifd_handle_alias(struct ubus_context *ctx, struct ubus_object *obj,
+		    struct ubus_request_data *req, const char *method,
+		    struct blob_attr *msg)
+{
+	struct device *dev = NULL;
+	struct blob_attr *tb[__ALIAS_ATTR_MAX];
+	struct blob_attr *cur;
+	int rem;
+
+	blobmsg_parse(alias_attrs, __ALIAS_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+
+	if (!tb[ALIAS_ATTR_ALIAS])
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	if ((cur = tb[ALIAS_ATTR_DEV]) != NULL) {
+		dev = device_get(blobmsg_data(cur), true);
+		if (!dev)
+			return UBUS_STATUS_NOT_FOUND;
+	}
+
+	blobmsg_for_each_attr(cur, tb[ALIAS_ATTR_ALIAS], rem) {
+		if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+			goto error;
+
+		if (!blobmsg_check_attr(cur, NULL))
+			goto error;
+
+		alias_notify_device(blobmsg_data(cur), dev);
+	}
+	return 0;
+
+error:
+	device_free_unused(dev);
+	return UBUS_STATUS_INVALID_ARGUMENT;
+}
+
 static struct ubus_method dev_object_methods[] = {
-	UBUS_METHOD("status", netifd_dev_status, dev_policy)
+	UBUS_METHOD("status", netifd_dev_status, dev_policy),
+	UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs),
 };
 
 static struct ubus_object_type dev_object_type =
@@ -187,6 +236,7 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
 		     struct blob_attr *msg)
 {
 	struct interface *iface;
+	struct device *dev;
 
 	iface = container_of(obj, struct interface, ubus);
 
@@ -199,24 +249,12 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
 	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->main_dev.dev) {
-		struct device *dev = iface->main_dev.dev;
-		const char *field;
-		void *devinfo;
-
-		/* use a different field for virtual devices */
-		if (dev->avl.key)
-			field = "device";
-		else
-			field = "link";
-
-		devinfo = blobmsg_open_table(&b, field);
-		blobmsg_add_string(&b, "name", dev->ifname);
-
-		blobmsg_close_table(&b, devinfo);
-	}
+	dev = iface->main_dev.dev;
+	if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
+		blobmsg_add_string(&b, "device", dev->ifname);
 
 	if (!list_is_empty(&iface->errors))
 		netifd_add_interface_errors(&b, iface);
@@ -231,9 +269,9 @@ 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 interface *iface;
-	struct device *dev, *main_dev;
 	struct blob_attr *tb[__DEV_MAX];
+	struct interface *iface;
+	struct device *dev;
 	bool add = !strncmp(method, "add", 3);
 	int ret;
 
@@ -244,30 +282,18 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!tb[DEV_NAME])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	main_dev = iface->main_dev.dev;
-	if (!main_dev)
-		return UBUS_STATUS_NOT_FOUND;
-
-	if (!main_dev->hotplug_ops)
-		return UBUS_STATUS_NOT_SUPPORTED;
+	device_lock();
 
-	dev = device_get(blobmsg_data(tb[DEV_NAME]), add);
-	if (!dev)
+	dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
+	if (add && !dev)
 		return UBUS_STATUS_NOT_FOUND;
 
-	if (main_dev != dev) {
-		if (add)
-			ret = main_dev->hotplug_ops->add(main_dev, dev);
-		else
-			ret = main_dev->hotplug_ops->del(main_dev, dev);
-		if (ret)
-			ret = UBUS_STATUS_UNKNOWN_ERROR;
-	} else {
-		ret = UBUS_STATUS_INVALID_ARGUMENT;
-	}
-
 	if (add)
-		device_free_unused(dev);
+		return interface_add_link(iface, dev);
+	else
+		return interface_remove_link(iface, dev);
+
+	device_unlock();
 
 	return ret;
 }
@@ -313,14 +339,34 @@ netifd_iface_remove(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
+static int
+netifd_handle_iface_prepare(struct ubus_context *ctx, struct ubus_object *obj,
+			    struct ubus_request_data *req, const char *method,
+			    struct blob_attr *msg)
+{
+	struct interface *iface;
+	struct device *dev;
+	const struct device_hotplug_ops *ops;
+
+	iface = container_of(obj, struct interface, ubus);
+	dev = iface->main_dev.dev;
+	if (!dev)
+		return 0;
+
+	ops = dev->hotplug_ops;
+	if (!ops)
+		return 0;
+
+	return ops->prepare(dev);
+}
+
 static struct ubus_method iface_object_methods[] = {
 	{ .name = "up", .handler = netifd_handle_up },
 	{ .name = "down", .handler = netifd_handle_down },
 	{ .name = "status", .handler = netifd_handle_status },
-	{ .name = "add_device", .handler = netifd_iface_handle_device,
-	  .policy = dev_policy, .n_policy = __DEV_MAX },
-	{ .name = "remove_device", .handler = netifd_iface_handle_device,
-	  .policy = dev_policy, .n_policy = __DEV_MAX },
+	{ .name = "prepare", .handler = netifd_handle_iface_prepare },
+	UBUS_METHOD("add_device", netifd_iface_handle_device, dev_policy ),
+	UBUS_METHOD("remove_device", netifd_iface_handle_device, dev_policy ),
 	{ .name = "notify_proto", .handler = netifd_iface_notify_proto },
 	{ .name = "remove", .handler = netifd_iface_remove }
 };