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

diff --git a/ubus.c b/ubus.c
index 8b9bc3a..5d9d921 100644
--- a/ubus.c
+++ b/ubus.c
@@ -2,6 +2,7 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "proto.h"
 #include "ubus.h"
 
 static struct ubus_context *ctx = NULL;
@@ -47,9 +48,19 @@ netifd_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 	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("remove_device", netifd_handle_device, dev_policy),
+	{ .name = "restart", .handler = netifd_handle_restart },
 };
 
 static struct ubus_object_type main_object_type =
@@ -147,19 +158,14 @@ 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;
@@ -207,32 +213,74 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!tb[DEV_NAME])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	dev = device_get(blobmsg_data(tb[DEV_NAME]), add);
-	if (!dev)
-		return UBUS_STATUS_NOT_FOUND;
-
 	main_dev = iface->main_dev.dev;
 	if (!main_dev)
 		return UBUS_STATUS_NOT_FOUND;
 
-	if (main_dev == dev)
-		return UBUS_STATUS_INVALID_ARGUMENT;
-
 	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)
-		ret = main_dev->hotplug_ops->add(main_dev, dev);
-	else
-		ret = main_dev->hotplug_ops->del(main_dev, dev);
+		device_free_unused(dev);
 
-	if (ret)
-		return UBUS_STATUS_UNKNOWN_ERROR;
+	return ret;
+}
 
-	return 0;
+
+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 },
@@ -242,6 +290,8 @@ static struct ubus_method iface_object_methods[] = {
 	  .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 =