fix config routes enable/disable handling on down/up

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index d34cc87..4746c4f 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -235,7 +235,8 @@ static void
 interface_ip_dump_address_list(struct interface_ip_settings *ip)
 {
        struct device_addr *addr;
-       static char *buf;
+       char *buf;
+       void *a;
        int buflen = 128;
        int af;
 
@@ -245,11 +246,46 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip)
                else
                        af = AF_INET6;
 
-               buf = blobmsg_alloc_string_buffer(&b, NULL, buflen);
-               inet_ntop(af, &addr->addr, buf, buflen - 5);
-               buf += strlen(buf);
-               sprintf(buf, "/%d", addr->mask);
+               a = blobmsg_open_table(&b, NULL);
+
+               buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
+               inet_ntop(af, &addr->addr, buf, buflen);
                blobmsg_add_string_buffer(&b);
+
+               blobmsg_add_u32(&b, "mask", addr->mask);
+
+               blobmsg_close_table(&b, a);
+       }
+}
+
+static void
+interface_ip_dump_route_list(struct interface_ip_settings *ip)
+{
+       struct device_route *route;
+       static char *buf;
+       int buflen = 128;
+       void *r;
+       int af;
+
+       vlist_for_each_element(&ip->route, route, node) {
+               if ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
+                       af = AF_INET;
+               else
+                       af = AF_INET6;
+
+               r = blobmsg_open_table(&b, NULL);
+
+               buf = blobmsg_alloc_string_buffer(&b, "target", buflen);
+               inet_ntop(af, &route->addr, buf, buflen);
+               blobmsg_add_string_buffer(&b);
+
+               blobmsg_add_u32(&b, "mask", route->mask);
+
+               buf = blobmsg_alloc_string_buffer(&b, "nexthop", buflen);
+               inet_ntop(af, &route->nexthop, buf, buflen);
+               blobmsg_add_string_buffer(&b);
+
+               blobmsg_close_table(&b, r);
        }
 }
 
@@ -259,6 +295,7 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
                     struct blob_attr *msg)
 {
        struct interface *iface;
+       struct interface_data *data;
        struct device *dev;
        void *a;
 
@@ -273,7 +310,7 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
        if (iface->state == IFS_UP) {
                time_t cur = system_get_rtime();
                blobmsg_add_u32(&b, "uptime", cur - iface->start_time);
-               blobmsg_add_string(&b, "l3_device", iface->l3_dev->dev->ifname);
+               blobmsg_add_string(&b, "l3_device", iface->l3_dev.dev->ifname);
        }
 
        dev = iface->main_dev.dev;
@@ -285,8 +322,18 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
                interface_ip_dump_address_list(&iface->config_ip);
                interface_ip_dump_address_list(&iface->proto_ip);
                blobmsg_close_array(&b, a);
+               a = blobmsg_open_array(&b, "route");
+               interface_ip_dump_route_list(&iface->config_ip);
+               interface_ip_dump_route_list(&iface->proto_ip);
+               blobmsg_close_array(&b, a);
        }
 
+       a = blobmsg_open_table(&b, "data");
+       avl_for_each_element(&iface->data, data, node)
+               blob_put(&b, blob_id(data->data), blob_data(data->data), blob_len(data->data));
+
+       blobmsg_close_table(&b, a);
+
        if (!list_is_empty(&iface->errors))
                netifd_add_interface_errors(&b, iface);
 
@@ -391,6 +438,26 @@ netifd_handle_iface_prepare(struct ubus_context *ctx, struct ubus_object *obj,
        return ops->prepare(dev);
 }
 
+static int
+netifd_handle_set_data(struct ubus_context *ctx, struct ubus_object *obj,
+                      struct ubus_request_data *req, const char *method,
+                      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;
+}
+
 static struct ubus_method iface_object_methods[] = {
        { .name = "up", .handler = netifd_handle_up },
        { .name = "down", .handler = netifd_handle_down },
@@ -399,7 +466,8 @@ static struct ubus_method iface_object_methods[] = {
        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 },
-       { .name = "remove", .handler = netifd_iface_remove }
+       { .name = "remove", .handler = netifd_iface_remove },
+       { .name = "set_data", .handler = netifd_handle_set_data },
 };
 
 static struct ubus_object_type iface_object_type =