rename the network.interface ubus object to just network

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index a8d3e3c..973718c 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -4,6 +4,7 @@
 #include "interface.h"
 #include "proto.h"
 #include "ubus.h"
+#include "system.h"
 
 static struct ubus_context *ctx = NULL;
 static struct blob_buf b;
@@ -43,7 +44,7 @@ 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;
 }
@@ -57,17 +58,27 @@ netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj,
        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 =
        UBUS_OBJECT_TYPE("netifd", main_object_methods);
 
 static struct ubus_object main_object = {
-       .name = "network.interface",
+       .name = "network",
        .type = &main_object_type,
        .methods = main_object_methods,
        .n_methods = ARRAY_SIZE(main_object_methods),
@@ -167,6 +178,12 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
        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->state == IFS_UP) {
+               time_t cur = system_get_rtime();
+               blobmsg_add_u32(&b, "uptime", cur - iface->start_time);
+       }
+
        if (iface->main_dev.dev) {
                struct device *dev = iface->main_dev.dev;
                const char *field;
@@ -257,6 +274,31 @@ netifd_iface_notify_proto(struct ubus_context *ctx, struct ubus_object *obj,
        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 },
@@ -266,6 +308,7 @@ static struct ubus_method iface_object_methods[] = {
        { .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 =
@@ -273,6 +316,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;