ubus: Use device_find to find a device when displaying device info

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index bed1fa4..8ba43c0 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -140,8 +140,6 @@ netifd_add_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
        if (!iface)
                return UBUS_STATUS_UNKNOWN_ERROR;
 
-       iface->device_config = true;
-
        config = blob_memdup(msg);
        if (!config)
                goto error;
@@ -161,11 +159,6 @@ netifd_add_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
        if (!dev || !dev->default_config)
                return UBUS_STATUS_UNKNOWN_ERROR;
 
-       device_set_config(dev, dev->type, msg);
-
-       if (iface->state != IFS_SETUP && iface->state != IFS_UP)
-               vlist_delete(&interfaces, &iface->node);
-
        return UBUS_STATUS_OK;
 
 error:
@@ -173,38 +166,12 @@ error:
        return UBUS_STATUS_UNKNOWN_ERROR;
 }
 
-static int
-netifd_del_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
-                     struct ubus_request_data *req, const char *method,
-                     struct blob_attr *msg)
-{
-       struct blob_attr *tb[__DI_MAX];
-       struct interface *iface;
-
-       blobmsg_parse(dynamic_policy, __DI_MAX, tb, blob_data(msg), blob_len(msg));
-
-       if (!tb[DI_NAME])
-               return UBUS_STATUS_INVALID_ARGUMENT;
-
-       const char *name = blobmsg_get_string(tb[DI_NAME]);
-       iface = vlist_find(&interfaces, name, iface, node);
-
-       if (!iface)
-               return UBUS_STATUS_NOT_FOUND;
-       else if (!iface->dynamic)
-               return UBUS_STATUS_INVALID_COMMAND;
-
-       vlist_delete(&interfaces, &iface->node);
-       return UBUS_STATUS_OK;
-}
-
 static struct ubus_method main_object_methods[] = {
        { .name = "restart", .handler = netifd_handle_restart },
        { .name = "reload", .handler = netifd_handle_reload },
        UBUS_METHOD("add_host_route", netifd_add_host_route, route_policy),
        { .name = "get_proto_handlers", .handler = netifd_get_proto_handlers },
        UBUS_METHOD("add_dynamic", netifd_add_dynamic, dynamic_policy),
-       UBUS_METHOD("del_dynamic", netifd_del_dynamic, dynamic_policy),
 };
 
 static struct ubus_object_type main_object_type =
@@ -237,7 +204,7 @@ netifd_dev_status(struct ubus_context *ctx, struct ubus_object *obj,
        blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
 
        if (tb[DEV_NAME]) {
-               dev = device_get(blobmsg_data(tb[DEV_NAME]), false);
+               dev = device_find(blobmsg_data(tb[DEV_NAME]));
                if (!dev)
                        return UBUS_STATUS_INVALID_ARGUMENT;
        }
@@ -323,7 +290,7 @@ netifd_handle_set_state(struct ubus_context *ctx, struct ubus_object *obj,
        if (!cur)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       dev = device_get(blobmsg_data(cur), false);
+       dev = device_find(blobmsg_data(cur));
        if (!dev)
                return UBUS_STATUS_NOT_FOUND;
 
@@ -682,6 +649,7 @@ netifd_dump_status(struct interface *iface)
        blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP);
        blobmsg_add_u8(&b, "available", iface->available);
        blobmsg_add_u8(&b, "autostart", iface->autostart);
+       blobmsg_add_u8(&b, "dynamic", iface->dynamic);
 
        if (iface->state == IFS_UP) {
                time_t cur = system_get_rtime();
@@ -694,7 +662,7 @@ netifd_dump_status(struct interface *iface)
                blobmsg_add_string(&b, "proto", iface->proto_handler->name);
 
        dev = iface->main_dev.dev;
-       if (dev && !dev->hidden &&
+       if (dev && !dev->hidden && iface->proto_handler &&
            !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
                blobmsg_add_string(&b, "device", dev->ifname);
 
@@ -717,8 +685,9 @@ netifd_dump_status(struct interface *iface)
                if (iface->ip4table)
                        blobmsg_add_u32(&b, "ip4table", iface->ip4table);
                if (iface->ip6table)
-                       blobmsg_add_u32(&b, "ip6table", iface->ip6table);                 
+                       blobmsg_add_u32(&b, "ip6table", iface->ip6table);
                blobmsg_add_u32(&b, "metric", iface->metric);
+               blobmsg_add_u32(&b, "dns_metric", iface->dns_metric);
                blobmsg_add_u8(&b, "delegation", !iface->proto_ip.no_delegation);
                a = blobmsg_open_array(&b, "ipv4-address");
                interface_ip_dump_address_list(&iface->config_ip, false, true);
@@ -819,23 +788,40 @@ netifd_handle_dump(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 }
 
+enum {
+       DEV_LINK_NAME,
+       DEV_LINK_EXT,
+       __DEV_LINK_MAX,
+};
+
+static const struct blobmsg_policy dev_link_policy[__DEV_LINK_MAX] = {
+       [DEV_LINK_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
+       [DEV_LINK_EXT] = { .name = "link-ext", .type = BLOBMSG_TYPE_BOOL },
+};
+
 static int
 netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
                           struct ubus_request_data *req, const char *method,
                           struct blob_attr *msg)
 {
-       struct blob_attr *tb[__DEV_MAX];
+       struct blob_attr *tb[__DEV_LINK_MAX];
+       struct blob_attr *cur;
        struct interface *iface;
        bool add = !strncmp(method, "add", 3);
+       bool link_ext = true;
 
        iface = container_of(obj, struct interface, ubus);
 
-       blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(dev_link_policy, __DEV_LINK_MAX, tb, blob_data(msg), blob_len(msg));
 
-       if (!tb[DEV_NAME])
+       if (!tb[DEV_LINK_NAME])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       return interface_handle_link(iface, blobmsg_data(tb[DEV_NAME]), add);
+       cur = tb[DEV_LINK_EXT];
+       if (cur)
+               link_ext = blobmsg_get_bool(cur);
+
+       return interface_handle_link(iface, blobmsg_data(tb[DEV_LINK_NAME]), add, link_ext);
 }
 
 
@@ -906,18 +892,10 @@ netifd_handle_set_data(struct ubus_context *ctx, struct ubus_object *obj,
                       struct blob_attr *msg)
 {
        struct interface *iface;
-       struct blob_attr *cur;
-       int rem, ret;
 
        iface = container_of(obj, struct interface, ubus);
 
-       blob_for_each_attr(cur, msg, rem) {
-               ret = interface_add_data(iface, cur);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
+       return interface_parse_data(iface, msg);
 }
 
 static struct ubus_method iface_object_methods[] = {
@@ -926,8 +904,8 @@ static struct ubus_method iface_object_methods[] = {
        { .name = "status", .handler = netifd_handle_status },
        { .name = "prepare", .handler = netifd_handle_iface_prepare },
        { .name = "dump", .handler = netifd_handle_dump },
-       UBUS_METHOD("add_device", netifd_iface_handle_device, dev_policy ),
-       UBUS_METHOD("remove_device", netifd_iface_handle_device, dev_policy ),
+       UBUS_METHOD("add_device", netifd_iface_handle_device, dev_link_policy ),
+       UBUS_METHOD("remove_device", netifd_iface_handle_device, dev_link_policy ),
        { .name = "notify_proto", .handler = netifd_iface_notify_proto },
        { .name = "remove", .handler = netifd_iface_remove },
        { .name = "set_data", .handler = netifd_handle_set_data },
@@ -992,6 +970,9 @@ static void netifd_add_iface_object(void)
        int i;
 
        methods = calloc(1, sizeof(iface_object_methods));
+       if (!methods)
+               return;
+
        memcpy(methods, iface_object_methods, sizeof(iface_object_methods));
        iface_object.methods = methods;