ensure hotplug devices are marked as present in the add path - they are not cleaned...

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index dcc4098..0f19607 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -201,9 +201,47 @@ error:
        return UBUS_STATUS_INVALID_ARGUMENT;
 }
 
+enum {
+       DEV_STATE_NAME,
+       DEV_STATE_DEFER,
+       __DEV_STATE_MAX,
+};
+
+static const struct blobmsg_policy dev_state_policy[__DEV_STATE_MAX] = {
+       [DEV_STATE_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
+       [DEV_STATE_DEFER] = { .name = "defer", .type = BLOBMSG_TYPE_BOOL },
+};
+
+static int
+netifd_handle_set_state(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
+{
+       struct device *dev = NULL;
+       struct blob_attr *tb[__DEV_STATE_MAX];
+       struct blob_attr *cur;
+
+       blobmsg_parse(dev_state_policy, __DEV_STATE_MAX, tb, blob_data(msg), blob_len(msg));
+
+       cur = tb[DEV_STATE_NAME];
+       if (!cur)
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       dev = device_get(blobmsg_data(cur), false);
+       if (!dev)
+               return UBUS_STATUS_NOT_FOUND;
+
+       cur = tb[DEV_STATE_DEFER];
+       if (cur)
+               device_set_deferred(dev, !!blobmsg_get_u8(cur));
+
+       return 0;
+}
+
 static struct ubus_method dev_object_methods[] = {
        UBUS_METHOD("status", netifd_dev_status, dev_policy),
        UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs),
+       UBUS_METHOD("set_state", netifd_handle_set_state, dev_state_policy),
 };
 
 static struct ubus_object_type dev_object_type =
@@ -394,6 +432,14 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip)
                inet_ntop(af, &route->nexthop, buf, buflen);
                blobmsg_add_string_buffer(&b);
 
+               if (route->flags & DEVROUTE_MTU)
+                       blobmsg_add_u32(&b, "mtu", route->mtu);
+
+               if (route->flags & DEVROUTE_METRIC)
+                       blobmsg_add_u32(&b, "metric", route->metric);
+
+               blobmsg_add_u8(&b, "enabled", route->enabled);
+
                blobmsg_close_table(&b, r);
        }
 }
@@ -450,10 +496,12 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
                blobmsg_add_string(&b, "proto", iface->proto_handler->name);
 
        dev = iface->main_dev.dev;
-       if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
+       if (dev && !dev->hidden &&
+           !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
                blobmsg_add_string(&b, "device", dev->ifname);
 
        if (iface->state == IFS_UP) {
+               blobmsg_add_u32(&b, "metric", iface->metric);
                a = blobmsg_open_array(&b, "ipv4-address");
                interface_ip_dump_address_list(&iface->config_ip, false);
                interface_ip_dump_address_list(&iface->proto_ip, false);
@@ -514,10 +562,12 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
        if (add && !dev)
                return UBUS_STATUS_NOT_FOUND;
 
-       if (add)
-               return interface_add_link(iface, dev);
-       else
-               return interface_remove_link(iface, dev);
+       if (add) {
+               device_set_present(dev, true);
+               ret = interface_add_link(iface, dev);
+       } else {
+               ret = interface_remove_link(iface, dev);
+       }
 
        device_unlock();