wireless: add another debug message

[project/netifd.git] / wireless.c

diff --git a/wireless.c b/wireless.c
index 7a03ce8..c099a33 100644 (file)
--- a/wireless.c
+++ b/wireless.c
@@ -197,6 +197,7 @@ wireless_device_setup_cancel(struct wireless_device *wdev)
        if (wdev->cancel)
                return;
 
+       D(WIRELESS, "Cancel wireless device '%s' setup\n", wdev->name);
        wdev->cancel = true;
        uloop_timeout_set(&wdev->timeout, 10 * 1000);
 }
@@ -352,7 +353,10 @@ wireless_device_free(struct wireless_device *wdev)
 static void
 wdev_handle_config_change(struct wireless_device *wdev)
 {
-       switch(wdev->config_state) {
+       enum interface_config_state state = wdev->config_state;
+
+       wdev->config_state = IFC_NORMAL;
+       switch(state) {
        case IFC_NORMAL:
                break;
        case IFC_RELOAD:
@@ -706,6 +710,7 @@ wireless_device_add_process(struct wireless_device *wdev, struct blob_attr *data
        struct blob_attr *tb[__PROC_ATTR_MAX];
        struct wireless_process *proc;
        char *name;
+       int pid;
 
        if (!data)
                return UBUS_STATUS_INVALID_ARGUMENT;
@@ -714,10 +719,14 @@ wireless_device_add_process(struct wireless_device *wdev, struct blob_attr *data
        if (!tb[PROC_ATTR_PID] || !tb[PROC_ATTR_EXE])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
+       pid = blobmsg_get_u32(tb[PROC_ATTR_PID]);
+       if (pid < 2)
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
        proc = calloc_a(sizeof(*proc),
                &name, strlen(blobmsg_data(tb[PROC_ATTR_EXE])) + 1);
 
-       proc->pid = blobmsg_get_u32(tb[PROC_ATTR_PID]);
+       proc->pid = pid;
        proc->exe = strcpy(name, blobmsg_data(tb[PROC_ATTR_EXE]));
 
        if (tb[PROC_ATTR_REQUIRED])
@@ -754,7 +763,7 @@ wireless_device_process_kill_all(struct wireless_device *wdev, struct blob_attr
                signal = blobmsg_get_u32(cur);
 
        if ((cur = tb[KILL_ATTR_IMMEDIATE]))
-               immediate = blobmsg_get_u32(cur);
+               immediate = blobmsg_get_bool(cur);
 
        if (wdev->state != IFS_TEARDOWN || wdev->kill_request)
                return UBUS_STATUS_PERMISSION_DENIED;