Add ubus function to create nested interfaces

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 774f9d1..d245541 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -108,11 +108,69 @@ netifd_get_proto_handlers(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 }
 
+
+enum {
+       DI_NAME,
+       __DI_MAX
+};
+
+static const struct blobmsg_policy dynamic_policy[__DI_MAX] = {
+       [DI_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
+};
+
+static int
+netifd_add_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;
+       struct blob_attr *config;
+       struct device *dev;
+
+       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 = calloc(1, sizeof(*iface));
+       if (!iface)
+               return UBUS_STATUS_UNKNOWN_ERROR;
+
+       interface_init(iface, name, msg, true);
+       iface->device_config = true;
+
+       config = blob_memdup(msg);
+       if (!config)
+               goto error;
+
+       interface_add(iface, config);
+
+       // need to look up the interface name again, in case of config update,
+       iface = vlist_find(&interfaces, name, iface, node);
+       if (!iface)
+               return UBUS_STATUS_UNKNOWN_ERROR;
+
+       dev = iface->main_dev.dev;
+       if (!dev || !dev->default_config)
+               return UBUS_STATUS_UNKNOWN_ERROR;
+
+       device_set_config(dev, dev->type, msg);
+       return UBUS_STATUS_OK;
+
+error:
+       free(iface);
+       return UBUS_STATUS_UNKNOWN_ERROR;
+}
+
 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),
 };
 
 static struct ubus_object_type main_object_type =
@@ -463,6 +521,8 @@ interface_ip_dump_prefix_list(struct interface_ip_settings *ip)
                if (prefix->valid_until)
                        blobmsg_add_u32(&b, "valid", prefix->valid_until - now);
 
+               blobmsg_add_string(&b, "class", prefix->pclass);
+
                c = blobmsg_open_table(&b, "assigned");
                struct device_prefix_assignment *assign;
                list_for_each_entry(assign, &prefix->assignments, head) {
@@ -563,19 +623,14 @@ interface_ip_dump_dns_search_list(struct interface_ip_settings *ip,
        }
 }
 
-static int
-netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
-                    struct ubus_request_data *req, const char *method,
-                    struct blob_attr *msg)
+static void
+netifd_dump_status(struct interface *iface)
 {
-       struct interface *iface;
        struct interface_data *data;
        struct device *dev;
        void *a, *inactive;
 
-       iface = container_of(obj, struct interface, ubus);
-
-       blob_buf_init(&b, 0);
+       blobmsg_add_string(&b, "name", iface->name);
        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);
@@ -657,7 +712,38 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
 
        if (!list_is_empty(&iface->errors))
                netifd_add_interface_errors(&b, iface);
+}
+
+static int
+netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
+                    struct ubus_request_data *req, const char *method,
+                    struct blob_attr *msg)
+{
+       struct interface *iface = container_of(obj, struct interface, ubus);
+
+       blob_buf_init(&b, 0);
+       netifd_dump_status(iface);
+       ubus_send_reply(ctx, req, b.head);
+
+       return 0;
+}
+
+static int
+netifd_handle_dump(struct ubus_context *ctx, struct ubus_object *obj,
+                    struct ubus_request_data *req, const char *method,
+                    struct blob_attr *msg)
+{
+       blob_buf_init(&b, 0);
+       void *a = blobmsg_open_array(&b, "interface");
+
+       struct interface *iface;
+       vlist_for_each_element(&interfaces, iface, node) {
+               void *i = blobmsg_open_table(&b, NULL);
+               netifd_dump_status(iface);
+               blobmsg_close_table(&b, i);
+       }
 
+       blobmsg_close_array(&b, a);
        ubus_send_reply(ctx, req, b.head);
 
        return 0;
@@ -793,6 +879,7 @@ static struct ubus_method iface_object_methods[] = {
        { .name = "down", .handler = netifd_handle_down },
        { .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 ),
        { .name = "notify_proto", .handler = netifd_iface_notify_proto },
@@ -863,6 +950,9 @@ static void netifd_add_iface_object(void)
        iface_object.methods = methods;
 
        for (i = 0; i < ARRAY_SIZE(iface_object_methods); i++) {
+               if (methods[i].handler == netifd_handle_dump)
+                       continue;
+
                methods[i].handler = netifd_handle_iface;
                methods[i].policy = &iface_policy;
                methods[i].n_policy = 1;