X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=ca5d11021c831bcc41fa9ba594fde6aa900ec893;hp=6eba0b07e8faa12739c54b010f0d85da17606166;hb=49a8c2cecb4e1a54b986d9768c8f1f912365ac8b;hpb=d24673d0f2fbb5b8a38f3e3fec9b06ce9a3dec3f

diff --git a/ubus.c b/ubus.c
index 6eba0b0..ca5d110 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;
@@ -42,14 +43,34 @@ netifd_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!add || (tb[DEV_FORCE] && blobmsg_get_u8(tb[DEV_FORCE])))
 		device_set_present(dev, add);
 	else
-		check_device_state(dev);
+		device_check_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 int
+netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj,
+		      struct ubus_request_data *req, const char *method,
+		      struct blob_attr *msg)
+{
+	netifd_reload();
+	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 },
+	{ .name = "reload", .handler = netifd_handle_reload },
 };
 
 static struct ubus_object_type main_object_type =
@@ -154,7 +175,7 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
 	blob_buf_init(&b, 0);
 	blobmsg_add_u8(&b, "up", iface->state == IFS_UP);
 	blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP);
-	blobmsg_add_u8(&b, "active", iface->active);
+	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;
@@ -231,6 +252,46 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 
+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 },
@@ -239,6 +300,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 =
@@ -246,6 +309,15 @@ static struct ubus_object_type iface_object_type =
 
 
 void
+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);
+}
+
+void
 netifd_ubus_add_interface(struct interface *iface)
 {
 	struct ubus_object *obj = &iface->ubus;