do not attempt to get an interface if PROTO_FLAG_NODEV is set

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 8b9bc3a..c8f178c 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -47,9 +47,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 +157,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,31 +212,33 @@ 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;
 
-       if (add)
-               ret = main_dev->hotplug_ops->add(main_dev, dev);
-       else
-               ret = main_dev->hotplug_ops->del(main_dev, dev);
+       dev = device_get(blobmsg_data(tb[DEV_NAME]), add);
+       if (!dev)
+               return UBUS_STATUS_NOT_FOUND;
 
-       if (ret)
-               return UBUS_STATUS_UNKNOWN_ERROR;
+       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;
+       }
 
-       return 0;
-}
+       if (add)
+               device_free_unused(dev);
 
+       return ret;
+}
 
 
 static struct ubus_method iface_object_methods[] = {