wireless: add retry_setup_failed to status notification

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index c834d11..74cdf28 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -290,7 +290,7 @@ netifd_handle_set_state(struct ubus_context *ctx, struct ubus_object *obj,
        if (!cur)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       dev = device_get(blobmsg_data(cur), false);
+       dev = device_find(blobmsg_data(cur));
        if (!dev)
                return UBUS_STATUS_NOT_FOUND;
 
@@ -649,6 +649,7 @@ netifd_dump_status(struct interface *iface)
        blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP);
        blobmsg_add_u8(&b, "available", iface->available);
        blobmsg_add_u8(&b, "autostart", iface->autostart);
+       blobmsg_add_u8(&b, "dynamic", iface->dynamic);
 
        if (iface->state == IFS_UP) {
                time_t cur = system_get_rtime();
@@ -890,18 +891,10 @@ netifd_handle_set_data(struct ubus_context *ctx, struct ubus_object *obj,
                       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;
+       return interface_parse_data(iface, msg);
 }
 
 static struct ubus_method iface_object_methods[] = {
@@ -976,6 +969,9 @@ static void netifd_add_iface_object(void)
        int i;
 
        methods = calloc(1, sizeof(iface_object_methods));
+       if (!methods)
+               return;
+
        memcpy(methods, iface_object_methods, sizeof(iface_object_methods));
        iface_object.methods = methods;