X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=5d9d921e899b607c296e254bc7e2319a215dfd28;hp=e5df1fb1b9fe3c327e9660a2b1c9998618e52c30;hb=39f5ec857a31fe65e14cdf9b75927297e78015bb;hpb=d5202486636818e3ff48ede9d3e06c886c659c0a

diff --git a/ubus.c b/ubus.c
index e5df1fb..5d9d921 100644
--- a/ubus.c
+++ b/ubus.c
@@ -1,6 +1,8 @@
 #include <string.h>
 
 #include "netifd.h"
+#include "interface.h"
+#include "proto.h"
 #include "ubus.h"
 
 static struct ubus_context *ctx = NULL;
@@ -11,42 +13,54 @@ static struct blob_buf b;
 enum {
 	DEV_NAME,
 	DEV_FORCE,
-	DEV_LAST,
+	__DEV_MAX,
+	__DEV_MAX_NOFORCE = __DEV_MAX - 1,
 };
 
-static const struct blobmsg_policy dev_policy[] = {
+static const struct blobmsg_policy dev_policy[__DEV_MAX] = {
 	[DEV_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
 	[DEV_FORCE] = { .name = "force", .type = BLOBMSG_TYPE_INT8 },
 };
 
-static int netifd_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
-				struct ubus_request_data *req, const char *method,
-				struct blob_attr *msg)
+static int
+netifd_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
+		     struct ubus_request_data *req, const char *method,
+		     struct blob_attr *msg)
 {
 	struct device *dev;
-	struct blob_attr *tb[DEV_LAST];
+	struct blob_attr *tb[__DEV_MAX];
 	bool add = !strncmp(method, "add", 3);
 
-	blobmsg_parse(dev_policy, ARRAY_SIZE(dev_policy), tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
 
 	if (!tb[DEV_NAME])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	dev = get_device(blobmsg_data(tb[DEV_NAME]), false);
+	dev = device_get(blobmsg_data(tb[DEV_NAME]), false);
 	if (!dev)
 		return UBUS_STATUS_NOT_FOUND;
 
 	if (!add || (tb[DEV_FORCE] && blobmsg_get_u8(tb[DEV_FORCE])))
-		set_device_present(dev, add);
+		device_set_present(dev, add);
 	else
 		check_device_state(dev);
 
 	return 0;
 }
 
+static int
+netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj,
+		      struct ubus_request_data *req, const char *method,
+		      struct blob_attr *msg)
+{
+	netifd_restart();
+	return 0;
+}
+
 static struct ubus_method main_object_methods[] = {
 	UBUS_METHOD("add_device", netifd_handle_device, dev_policy),
-	UBUS_METHOD("del_device", netifd_handle_device, dev_policy),
+	UBUS_METHOD("remove_device", netifd_handle_device, dev_policy),
+	{ .name = "restart", .handler = netifd_handle_restart },
 };
 
 static struct ubus_object_type main_object_type =
@@ -59,7 +73,8 @@ static struct ubus_object main_object = {
 	.n_methods = ARRAY_SIZE(main_object_methods),
 };
 
-int netifd_ubus_init(const char *path)
+int
+netifd_ubus_init(const char *path)
 {
 	int ret;
 
@@ -78,7 +93,8 @@ int netifd_ubus_init(const char *path)
 	return 0;
 }
 
-void netifd_ubus_done(void)
+void
+netifd_ubus_done(void)
 {
 	ubus_free(ctx);
 }
@@ -86,31 +102,34 @@ void netifd_ubus_done(void)
 
 /* per-interface object */
 
-static int netifd_handle_up(struct ubus_context *ctx, struct ubus_object *obj,
-			    struct ubus_request_data *req, const char *method,
-			    struct blob_attr *msg)
+static int
+netifd_handle_up(struct ubus_context *ctx, struct ubus_object *obj,
+		 struct ubus_request_data *req, const char *method,
+		 struct blob_attr *msg)
 {
 	struct interface *iface;
 
 	iface = container_of(obj, struct interface, ubus);
-	set_interface_up(iface);
+	interface_set_up(iface);
 
 	return 0;
 }
 
-static int netifd_handle_down(struct ubus_context *ctx, struct ubus_object *obj,
-			      struct ubus_request_data *req, const char *method,
-			      struct blob_attr *msg)
+static int
+netifd_handle_down(struct ubus_context *ctx, struct ubus_object *obj,
+		   struct ubus_request_data *req, const char *method,
+		   struct blob_attr *msg)
 {
 	struct interface *iface;
 
 	iface = container_of(obj, struct interface, ubus);
-	set_interface_down(iface);
+	interface_set_down(iface);
 
 	return 0;
 }
 
-static void netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
+static void
+netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
 {
 	struct interface_error *error;
 	void *e, *e2, *e3;
@@ -134,23 +153,19 @@ static void netifd_add_interface_errors(struct blob_buf *b, struct interface *if
 	blobmsg_close_array(b, e);
 }
 
-static int netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
-				struct ubus_request_data *req, const char *method,
-				struct blob_attr *msg)
+static int
+netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
+		     struct ubus_request_data *req, const char *method,
+		     struct blob_attr *msg)
 {
-	static const char *iface_state[] = {
-		[IFS_SETUP] = "setup",
-		[IFS_UP] = "up",
-		[IFS_TEARDOWN] = "teardown",
-		[IFS_DOWN] = "down",
-	};
 	struct interface *iface;
 
 	iface = container_of(obj, struct interface, ubus);
 
 	blob_buf_init(&b, 0);
-	blobmsg_add_string(&b, "state", iface_state[iface->state]);
-	blobmsg_add_u8(&b, "active", iface->active);
+	blobmsg_add_u8(&b, "up", iface->state == IFS_UP);
+	blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP);
+	blobmsg_add_u8(&b, "available", iface->available);
 	blobmsg_add_u8(&b, "autostart", iface->autostart);
 	if (iface->main_dev.dev) {
 		struct device *dev = iface->main_dev.dev;
@@ -180,18 +195,111 @@ static int netifd_handle_status(struct ubus_context *ctx, struct ubus_object *ob
 	return 0;
 }
 
+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 interface *iface;
+	struct device *dev, *main_dev;
+	struct blob_attr *tb[__DEV_MAX];
+	bool add = !strncmp(method, "add", 3);
+	int ret;
+
+	iface = container_of(obj, struct interface, ubus);
+
+	blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
+
+	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;
+
+	dev = device_get(blobmsg_data(tb[DEV_NAME]), add);
+	if (!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 ret;
+}
+
+
+static int
+netifd_iface_notify_proto(struct ubus_context *ctx, struct ubus_object *obj,
+			  struct ubus_request_data *req, const char *method,
+			  struct blob_attr *msg)
+{
+	struct interface *iface;
+
+	iface = container_of(obj, struct interface, ubus);
+
+	if (!iface->proto || !iface->proto->notify)
+		return UBUS_STATUS_NOT_SUPPORTED;
+
+	return iface->proto->notify(iface->proto, msg);
+}
+
+static void
+netifd_iface_do_remove(struct uloop_timeout *timeout)
+{
+	struct interface *iface;
+
+	iface = container_of(timeout, struct interface, remove_timer);
+	vlist_delete(&interfaces, &iface->node);
+}
+
+static int
+netifd_iface_remove(struct ubus_context *ctx, struct ubus_object *obj,
+		    struct ubus_request_data *req, const char *method,
+		    struct blob_attr *msg)
+{
+	struct interface *iface;
+
+	iface = container_of(obj, struct interface, ubus);
+	if (iface->remove_timer.cb)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	iface->remove_timer.cb = netifd_iface_do_remove;
+	uloop_timeout_set(&iface->remove_timer, 100);
+	return 0;
+}
 
 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_NOFORCE },
+	{ .name = "remove_device", .handler = netifd_iface_handle_device,
+	  .policy = dev_policy, .n_policy = __DEV_MAX_NOFORCE },
+	{ .name = "notify_proto", .handler = netifd_iface_notify_proto },
+	{ .name = "remove", .handler = netifd_iface_remove }
 };
 
 static struct ubus_object_type iface_object_type =
 	UBUS_OBJECT_TYPE("netifd_iface", iface_object_methods);
 
 
-void netifd_ubus_add_interface(struct interface *iface)
+void
+netifd_ubus_add_interface(struct interface *iface)
 {
 	struct ubus_object *obj = &iface->ubus;
 	char *name;
@@ -212,7 +320,8 @@ void netifd_ubus_add_interface(struct interface *iface)
 	}
 }
 
-void netifd_ubus_remove_interface(struct interface *iface)
+void
+netifd_ubus_remove_interface(struct interface *iface)
 {
 	if (!iface->ubus.name)
 		return;