ubus events: don't incorrectly announce an interface as being up

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 399d46b..6a87c28 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -497,7 +497,7 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
 
                buf = blobmsg_alloc_string_buffer(&b, "source", buflen);
                inet_ntop(af, &route->source, buf, buflen);
-               snprintf(buf + strlen(buf), 4, "/%u", route->sourcemask);
+               snprintf(buf + strlen(buf), buflen - strlen(buf), "/%u", route->sourcemask);
                blobmsg_add_string_buffer(&b);
 
                blobmsg_close_table(&b, r);
@@ -636,13 +636,13 @@ interface_ip_dump_dns_search_list(struct interface_ip_settings *ip,
 }
 
 static void
-netifd_dump_status(struct interface *iface)
+netifd_dump_status(struct interface *iface, bool up)
 {
        struct interface_data *data;
        struct device *dev;
        void *a, *inactive;
 
-       blobmsg_add_u8(&b, "up", iface->state == IFS_UP);
+       blobmsg_add_u8(&b, "up", up && iface->state == IFS_UP);
        blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP);
        blobmsg_add_u8(&b, "available", iface->available);
        blobmsg_add_u8(&b, "autostart", iface->autostart);
@@ -662,6 +662,21 @@ netifd_dump_status(struct interface *iface)
                blobmsg_add_string(&b, "device", dev->ifname);
 
        if (iface->state == IFS_UP) {
+               if (iface->updated) {
+                       a = blobmsg_open_array(&b, "updated");
+
+                       if (iface->updated & IUF_ADDRESS)
+                               blobmsg_add_string(&b, NULL, "addresses");
+                       if (iface->updated & IUF_ROUTE)
+                               blobmsg_add_string(&b, NULL, "routes");
+                       if (iface->updated & IUF_PREFIX)
+                               blobmsg_add_string(&b, NULL, "prefixes");
+                       if (iface->updated & IUF_DATA)
+                               blobmsg_add_string(&b, NULL, "data");
+
+                       blobmsg_close_array(&b, a);
+               }
+
                if (iface->ip4table)
                        blobmsg_add_u32(&b, "ip4table", iface->ip4table);
                if (iface->ip6table)
@@ -738,7 +753,7 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
        struct interface *iface = container_of(obj, struct interface, ubus);
 
        blob_buf_init(&b, 0);
-       netifd_dump_status(iface);
+       netifd_dump_status(iface, true);
        ubus_send_reply(ctx, req, b.head);
 
        return 0;
@@ -757,7 +772,7 @@ netifd_handle_dump(struct ubus_context *ctx, struct ubus_object *obj,
        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);
+               netifd_dump_status(iface, true);
                blobmsg_close_table(&b, i);
        }
 
@@ -1049,6 +1064,29 @@ netifd_handle_wdev_status(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static int
+netifd_handle_wdev_get_validate(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_get_validate(wdev, &b);
+       } else {
+               vlist_for_each_element(&wireless_devices, wdev, node)
+                       wireless_device_get_validate(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)
@@ -1068,6 +1106,7 @@ static struct ubus_method wireless_object_methods[] = {
        { .name = "down", .handler = netifd_handle_wdev_down },
        { .name = "status", .handler = netifd_handle_wdev_status },
        { .name = "notify", .handler = netifd_handle_wdev_notify },
+       { .name = "get_validate", .handler = netifd_handle_wdev_get_validate },
 };
 
 static struct ubus_object_type wireless_object_type =
@@ -1124,7 +1163,7 @@ 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);
+       netifd_dump_status(iface, up);
        ubus_notify(ubus_ctx, &iface_object, event, b.head, -1);
        ubus_notify(ubus_ctx, &iface->ubus, event, b.head, -1);
 }