netifd: Export ip4table/ip6table via UBUS
[project/netifd.git] / ubus.c
diff --git a/ubus.c b/ubus.c
index 2fd9e92..794444e 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -22,8 +22,9 @@
 #include "proto.h"
 #include "ubus.h"
 #include "system.h"
+#include "wireless.h"
 
-static struct ubus_context *ctx = NULL;
+struct ubus_context *ubus_ctx = NULL;
 static struct blob_buf b;
 static const char *ubus_path;
 
@@ -50,12 +51,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 +67,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 +78,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;
 
@@ -103,11 +109,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 = interface_alloc(name, msg);
+       if (!iface)
+               return UBUS_STATUS_UNKNOWN_ERROR;
+
+       interface_set_dynamic(iface);
+       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 =
@@ -256,8 +320,8 @@ static struct ubus_object dev_object = {
 static void
 netifd_ubus_add_fd(void)
 {
-       ubus_add_uloop(ctx);
-       system_fd_set_cloexec(ctx->sock.fd);
+       ubus_add_uloop(ubus_ctx);
+       system_fd_set_cloexec(ubus_ctx->sock.fd);
 }
 
 static void
@@ -268,13 +332,13 @@ netifd_ubus_reconnect_timer(struct uloop_timeout *timeout)
        };
        int t = 2;
 
-       if (ubus_reconnect(ctx, ubus_path) != 0) {
+       if (ubus_reconnect(ubus_ctx, ubus_path) != 0) {
                DPRINTF("failed to reconnect, trying again in %d seconds\n", t);
                uloop_timeout_set(&retry, t * 1000);
                return;
        }
 
-       DPRINTF("reconnected to ubus, new id: %08x\n", ctx->local_id);
+       DPRINTF("reconnected to ubus, new id: %08x\n", ubus_ctx->local_id);
        netifd_ubus_add_fd();
 }
 
@@ -347,6 +411,7 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6,
        int buflen = 128;
        int af;
 
+       time_t now = system_get_rtime();
        vlist_for_each_element(&ip->addr, addr, node) {
                if (addr->enabled != enabled)
                        continue;
@@ -367,6 +432,19 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6,
 
                blobmsg_add_u32(&b, "mask", addr->mask);
 
+               if (addr->preferred_until) {
+                       int preferred = addr->preferred_until - now;
+                       if (preferred < 0)
+                               preferred = 0;
+                       blobmsg_add_u32(&b, "preferred", preferred);
+               }
+
+               if (addr->valid_until)
+                       blobmsg_add_u32(&b, "valid", addr->valid_until - now);
+
+               if (addr->pclass)
+                       blobmsg_add_string(&b, "class", addr->pclass);
+
                blobmsg_close_table(&b, a);
        }
 }
@@ -380,6 +458,7 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
        void *r;
        int af;
 
+       time_t now = system_get_rtime();
        vlist_for_each_element(&ip->route, route, node) {
                if (route->enabled != enabled)
                        continue;
@@ -407,6 +486,17 @@ 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);
+
+               buf = blobmsg_alloc_string_buffer(&b, "source", buflen);
+               inet_ntop(af, &route->source, buf, buflen);
+               snprintf(buf + strlen(buf), 4, "/%u", route->sourcemask);
+               blobmsg_add_string_buffer(&b);
+
                blobmsg_close_table(&b, r);
        }
 }
@@ -420,6 +510,7 @@ interface_ip_dump_prefix_list(struct interface_ip_settings *ip)
        void *a, *c;
        const int buflen = INET6_ADDRSTRLEN;
 
+       time_t now = system_get_rtime();
        vlist_for_each_element(&ip->prefix, prefix, node) {
                a = blobmsg_open_table(&b, NULL);
 
@@ -429,7 +520,6 @@ interface_ip_dump_prefix_list(struct interface_ip_settings *ip)
 
                blobmsg_add_u32(&b, "mask", prefix->length);
 
-               time_t now = system_get_rtime();
                if (prefix->preferred_until) {
                        int preferred = prefix->preferred_until - now;
                        if (preferred < 0)
@@ -437,20 +527,24 @@ interface_ip_dump_prefix_list(struct interface_ip_settings *ip)
                        blobmsg_add_u32(&b, "preferred", preferred);
                }
 
-               if (prefix->valid_until) {
-                       int valid = prefix->valid_until - now;
-                       if (valid < 0)
-                               valid = 0;
-                       blobmsg_add_u32(&b, "valid", valid);
-               }
+               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);
@@ -465,6 +559,48 @@ interface_ip_dump_prefix_list(struct interface_ip_settings *ip)
 
 
 static void
+interface_ip_dump_prefix_assignment_list(struct interface *iface)
+{
+       void *a;
+       char *buf;
+       const int buflen = INET6_ADDRSTRLEN;
+       time_t now = system_get_rtime();
+
+       struct device_prefix *prefix;
+       list_for_each_entry(prefix, &prefixes, head) {
+               struct device_prefix_assignment *assign;
+               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, &addr, buf, buflen);
+                       blobmsg_add_string_buffer(&b);
+
+                       blobmsg_add_u32(&b, "mask", assign->length);
+
+                       if (prefix->preferred_until) {
+                               int preferred = prefix->preferred_until - now;
+                               if (preferred < 0)
+                                       preferred = 0;
+                               blobmsg_add_u32(&b, "preferred", preferred);
+                       }
+
+                       if (prefix->valid_until)
+                               blobmsg_add_u32(&b, "valid", prefix->valid_until - now);
+
+                       blobmsg_close_table(&b, a);
+               }
+       }
+}
+
+
+static void
 interface_ip_dump_dns_server_list(struct interface_ip_settings *ip,
                                   bool enabled)
 {
@@ -496,19 +632,13 @@ 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_u8(&b, "up", iface->state == IFS_UP);
        blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP);
        blobmsg_add_u8(&b, "available", iface->available);
@@ -529,7 +659,12 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
                blobmsg_add_string(&b, "device", dev->ifname);
 
        if (iface->state == IFS_UP) {
+               if (iface->ip4table)
+                       blobmsg_add_u32(&b, "ip4table", iface->ip4table);
+               if (iface->ip6table)
+                       blobmsg_add_u32(&b, "ip6table", iface->ip6table);                 
                blobmsg_add_u32(&b, "metric", iface->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);
                interface_ip_dump_address_list(&iface->proto_ip, false, true);
@@ -542,6 +677,9 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
                interface_ip_dump_prefix_list(&iface->config_ip);
                interface_ip_dump_prefix_list(&iface->proto_ip);
                blobmsg_close_array(&b, a);
+               a = blobmsg_open_array(&b, "ipv6-prefix-assignment");
+               interface_ip_dump_prefix_assignment_list(iface);
+               blobmsg_close_array(&b, a);
                a = blobmsg_open_array(&b, "route");
                interface_ip_dump_route_list(&iface->config_ip, true);
                interface_ip_dump_route_list(&iface->proto_ip, true);
@@ -587,7 +725,40 @@ 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);
+               blobmsg_add_string(&b, "interface", iface->name);
+               netifd_dump_status(iface);
+               blobmsg_close_table(&b, i);
+       }
+
+       blobmsg_close_array(&b, a);
        ubus_send_reply(ctx, req, b.head);
 
        return 0;
@@ -600,9 +771,7 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 {
        struct blob_attr *tb[__DEV_MAX];
        struct interface *iface;
-       struct device *dev;
        bool add = !strncmp(method, "add", 3);
-       int ret;
 
        iface = container_of(obj, struct interface, ubus);
 
@@ -611,29 +780,7 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
        if (!tb[DEV_NAME])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       device_lock();
-
-       dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
-       if (!dev) {
-               ret = UBUS_STATUS_NOT_FOUND;
-               goto out;
-       }
-
-       if (add) {
-               device_set_present(dev, true);
-               if (iface->device_config)
-                       device_set_config(dev, &simple_device_type, iface->config);
-
-               system_if_apply_settings(dev, &dev->settings);
-               ret = interface_add_link(iface, dev);
-       } else {
-               ret = interface_remove_link(iface, dev);
-       }
-
-out:
-       device_unlock();
-
-       return ret;
+       return interface_handle_link(iface, blobmsg_data(tb[DEV_NAME]), add);
 }
 
 
@@ -723,6 +870,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 },
@@ -742,7 +890,7 @@ static struct ubus_object iface_object = {
 
 static void netifd_add_object(struct ubus_object *obj)
 {
-       int ret = ubus_add_object(ctx, obj);
+       int ret = ubus_add_object(ubus_ctx, obj);
 
        if (ret != 0)
                fprintf(stderr, "Failed to publish object '%s': %s\n", obj->name, ubus_strerror(ret));
@@ -793,6 +941,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;
@@ -800,22 +951,150 @@ static void netifd_add_iface_object(void)
        netifd_add_object(&iface_object);
 }
 
+static struct wireless_device *
+get_wdev(struct blob_attr *msg, int *ret)
+{
+       struct blobmsg_policy wdev_policy = {
+               .name = "device",
+               .type = BLOBMSG_TYPE_STRING,
+       };
+       struct blob_attr *dev_attr;
+       struct wireless_device *wdev = NULL;
+
+
+       blobmsg_parse(&wdev_policy, 1, &dev_attr, blob_data(msg), blob_len(msg));
+       if (!dev_attr) {
+               *ret = UBUS_STATUS_INVALID_ARGUMENT;
+               return NULL;
+       }
+
+       wdev = vlist_find(&wireless_devices, blobmsg_data(dev_attr), wdev, node);
+       if (!wdev) {
+               *ret = UBUS_STATUS_NOT_FOUND;
+               return NULL;
+       }
+
+       *ret = 0;
+       return wdev;
+}
+
+static int
+netifd_handle_wdev_up(struct ubus_context *ctx, struct ubus_object *obj,
+                     struct ubus_request_data *req, const char *method,
+                     struct blob_attr *msg)
+{
+       struct wireless_device *wdev;
+       int ret;
+
+       wdev = get_wdev(msg, &ret);
+       if (ret == UBUS_STATUS_NOT_FOUND)
+               return ret;
+
+       if (wdev) {
+               wireless_device_set_up(wdev);
+       } else {
+               vlist_for_each_element(&wireless_devices, wdev, node)
+                       wireless_device_set_up(wdev);
+       }
+
+       return 0;
+}
+
+static int
+netifd_handle_wdev_down(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
+{
+       struct wireless_device *wdev;
+       int ret;
+
+       wdev = get_wdev(msg, &ret);
+       if (ret == UBUS_STATUS_NOT_FOUND)
+               return ret;
+
+       if (wdev) {
+               wireless_device_set_down(wdev);
+       } else {
+               vlist_for_each_element(&wireless_devices, wdev, node)
+                       wireless_device_set_down(wdev);
+       }
+
+       return 0;
+}
+
+static int
+netifd_handle_wdev_status(struct ubus_context *ctx, struct ubus_object *obj,
+                         struct ubus_request_data *req, const char *method,
+                         struct blob_attr *msg)
+{
+       struct wireless_device *wdev;
+       int ret;
+
+       wdev = get_wdev(msg, &ret);
+       if (ret == UBUS_STATUS_NOT_FOUND)
+               return ret;
+
+       blob_buf_init(&b, 0);
+       if (wdev) {
+               wireless_device_status(wdev, &b);
+       } else {
+               vlist_for_each_element(&wireless_devices, wdev, node)
+                       wireless_device_status(wdev, &b);
+       }
+       ubus_send_reply(ctx, req, b.head);
+       return 0;
+}
+
+static int
+netifd_handle_wdev_notify(struct ubus_context *ctx, struct ubus_object *obj,
+                         struct ubus_request_data *req, const char *method,
+                         struct blob_attr *msg)
+{
+       struct wireless_device *wdev;
+       int ret;
+
+       wdev = get_wdev(msg, &ret);
+       if (!wdev)
+               return ret;
+
+       return wireless_device_notify(wdev, msg, req);
+}
+
+static struct ubus_method wireless_object_methods[] = {
+       { .name = "up", .handler = netifd_handle_wdev_up },
+       { .name = "down", .handler = netifd_handle_wdev_down },
+       { .name = "status", .handler = netifd_handle_wdev_status },
+       { .name = "notify", .handler = netifd_handle_wdev_notify },
+};
+
+static struct ubus_object_type wireless_object_type =
+       UBUS_OBJECT_TYPE("netifd_iface", wireless_object_methods);
+
+
+static struct ubus_object wireless_object = {
+       .name = "network.wireless",
+       .type = &wireless_object_type,
+       .methods = wireless_object_methods,
+       .n_methods = ARRAY_SIZE(wireless_object_methods),
+};
+
 int
 netifd_ubus_init(const char *path)
 {
        uloop_init();
        ubus_path = path;
 
-       ctx = ubus_connect(path);
-       if (!ctx)
+       ubus_ctx = ubus_connect(path);
+       if (!ubus_ctx)
                return -EIO;
 
-       DPRINTF("connected as %08x\n", ctx->local_id);
-       ctx->connection_lost = netifd_ubus_connection_lost;
+       DPRINTF("connected as %08x\n", ubus_ctx->local_id);
+       ubus_ctx->connection_lost = netifd_ubus_connection_lost;
        netifd_ubus_add_fd();
 
        netifd_add_object(&main_object);
        netifd_add_object(&dev_object);
+       netifd_add_object(&wireless_object);
        netifd_add_iface_object();
 
        return 0;
@@ -824,7 +1103,7 @@ netifd_ubus_init(const char *path)
 void
 netifd_ubus_done(void)
 {
-       ubus_free(ctx);
+       ubus_free(ubus_ctx);
 }
 
 void
@@ -833,7 +1112,18 @@ 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);
+       ubus_send_event(ubus_ctx, "network.interface", b.head);
+}
+
+void
+netifd_ubus_interface_notify(struct interface *iface, bool up)
+{
+       const char *event = (up) ? "update" : "down";
+       blob_buf_init(&b, 0);
+       blobmsg_add_string(&b, "interface", iface->name);
+       netifd_dump_status(iface);
+       ubus_notify(ubus_ctx, &iface_object, event, b.head, -1);
+       ubus_notify(ubus_ctx, &iface->ubus, event, b.head, -1);
 }
 
 void
@@ -849,7 +1139,7 @@ netifd_ubus_add_interface(struct interface *iface)
        obj->type = &iface_object_type;
        obj->methods = iface_object_methods;
        obj->n_methods = ARRAY_SIZE(iface_object_methods);
-       if (ubus_add_object(ctx, &iface->ubus)) {
+       if (ubus_add_object(ubus_ctx, &iface->ubus)) {
                DPRINTF("failed to publish ubus object for interface '%s'\n", iface->name);
                free(name);
                obj->name = NULL;
@@ -862,6 +1152,6 @@ netifd_ubus_remove_interface(struct interface *iface)
        if (!iface->ubus.name)
                return;
 
-       ubus_remove_object(ctx, &iface->ubus);
+       ubus_remove_object(ubus_ctx, &iface->ubus);
        free((void *) iface->ubus.name);
 }