add an interface for notifying protocol handlers of state changes via ubus

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 6eba0b0..a8d3e3c 100644 (file)
--- 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 =
@@ -154,7 +165,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 +242,21 @@ 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 struct ubus_method iface_object_methods[] = {
        { .name = "up", .handler = netifd_handle_up },
        { .name = "down", .handler = netifd_handle_down },
@@ -239,6 +265,7 @@ 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 },
 };
 
 static struct ubus_object_type iface_object_type =