Add ubus methods for global interface status

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index f2421cc..a4c5b09 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -50,12 +50,14 @@ netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj,
 enum {
        HR_TARGET,
        HR_V6,
+       HR_INTERFACE,
        __HR_MAX
 };
 
 static const struct blobmsg_policy route_policy[__HR_MAX] = {
        [HR_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
        [HR_V6] = { .name = "v6", .type = BLOBMSG_TYPE_BOOL },
+       [HR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
 };
 
 static int
@@ -64,7 +66,7 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
                      struct blob_attr *msg)
 {
        struct blob_attr *tb[__HR_MAX];
-       struct interface *iface;
+       struct interface *iface = NULL;
        union if_addr a;
        bool v6 = false;
 
@@ -75,12 +77,15 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
        if (tb[HR_V6])
                v6 = blobmsg_get_bool(tb[HR_V6]);
 
+       if (tb[HR_INTERFACE])
+               iface = vlist_find(&interfaces, blobmsg_data(tb[HR_INTERFACE]), iface, node);
+
        memset(&a, 0, sizeof(a));
        if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(tb[HR_TARGET]), &a))
                return UBUS_STATUS_INVALID_ARGUMENT;
 
 
-       iface = interface_ip_add_target_route(&a, v6);
+       iface = interface_ip_add_target_route(&a, v6, iface);
        if (!iface)
                return UBUS_STATUS_NOT_FOUND;
 
@@ -419,6 +424,9 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
                if (route->flags & DEVROUTE_METRIC)
                        blobmsg_add_u32(&b, "metric", route->metric);
 
+               if (route->flags & DEVROUTE_TABLE)
+                       blobmsg_add_u32(&b, "table", route->table);
+
                if (route->valid_until)
                        blobmsg_add_u32(&b, "valid", route->valid_until - now);
 
@@ -455,13 +463,21 @@ 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;
-               vlist_for_each_element(prefix->assignments, assign, node) {
+               list_for_each_entry(assign, &prefix->assignments, head) {
+                       if (!assign->name[0])
+                               continue;
+
+                       struct in6_addr addr = prefix->addr;
+                       addr.s6_addr32[1] |= htonl(assign->assigned);
+
                        void *d = blobmsg_open_table(&b, assign->name);
 
                        buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
-                       inet_ntop(AF_INET6, &assign->addr, buf, buflen);
+                       inet_ntop(AF_INET6, &addr, buf, buflen);
                        blobmsg_add_string_buffer(&b);
 
                        blobmsg_add_u32(&b, "mask", assign->length);
@@ -486,14 +502,17 @@ interface_ip_dump_prefix_assignment_list(struct interface *iface)
        struct device_prefix *prefix;
        list_for_each_entry(prefix, &prefixes, head) {
                struct device_prefix_assignment *assign;
-               vlist_for_each_element(prefix->assignments, assign, node) {
+               list_for_each_entry(assign, &prefix->assignments, head) {
                        if (strcmp(assign->name, iface->name))
                                continue;
 
+                       struct in6_addr addr = prefix->addr;
+                       addr.s6_addr32[1] |= htonl(assign->assigned);
+
                        a = blobmsg_open_table(&b, NULL);
 
                        buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
-                       inet_ntop(AF_INET6, &assign->addr, buf, buflen);
+                       inet_ntop(AF_INET6, &addr, buf, buflen);
                        blobmsg_add_string_buffer(&b);
 
                        blobmsg_add_u32(&b, "mask", assign->length);
@@ -546,19 +565,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);
@@ -640,7 +654,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;
@@ -776,6 +821,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 },
@@ -846,6 +892,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;