wireless: fix parsing of the immediate flag for kill-all

[project/netifd.git] / wireless.c

diff --git a/wireless.c b/wireless.c
index 52d0eae..7d61a61 100644 (file)
--- a/wireless.c
+++ b/wireless.c
@@ -122,6 +122,7 @@ wireless_complete_kill_request(struct wireless_device *wdev)
 static void
 wireless_process_free(struct wireless_device *wdev, struct wireless_process *proc)
 {
+       D(WIRELESS, "Wireless device '%s' free pid %d\n", wdev->name, proc->pid);
        list_del(&proc->list);
        free(proc);
 
@@ -148,8 +149,10 @@ wireless_process_kill_all(struct wireless_device *wdev, int signal, bool free)
        list_for_each_entry_safe(proc, tmp, &wdev->script_proc, list) {
                bool check = wireless_process_check(proc);
 
-               if (check)
+               if (check) {
+                       D(WIRELESS, "Wireless device '%s' kill pid %d\n", wdev->name, proc->pid);
                        kill(proc->pid, signal);
+               }
 
                if (free || !check)
                        wireless_process_free(wdev, proc);
@@ -207,6 +210,7 @@ wireless_device_run_handler(struct wireless_device *wdev, bool up)
        int i = 0;
        int fds[2] = { -1, -1 };
 
+       D(WIRELESS, "Wireless device '%s' run %s handler\n", wdev->name, action);
        prepare_config(wdev, &b, up);
        config = blobmsg_format_json(b.head, true);
 
@@ -246,6 +250,8 @@ wireless_device_mark_down(struct wireless_device *wdev)
 {
        struct wireless_interface *vif;
 
+       D(WIRELESS, "Wireless device '%s' is now down\n", wdev->name);
+
        vlist_for_each_element(&wdev->interfaces, vif, node)
                wireless_interface_handle_link(vif, false);
 
@@ -263,6 +269,7 @@ wireless_device_mark_up(struct wireless_device *wdev)
 {
        struct wireless_interface *vif;
 
+       D(WIRELESS, "Wireless device '%s' is now up\n", wdev->name);
        wdev->state = IFS_UP;
        vlist_for_each_element(&wdev->interfaces, vif, node)
                wireless_interface_handle_link(vif, true);
@@ -345,7 +352,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:
@@ -495,6 +505,7 @@ vif_update(struct vlist_tree *tree, struct vlist_node *node_new,
                wdev = vif_new->wdev;
 
        if (vif_old && vif_new) {
+               vif_old->section = vif_new->section;
                if (blob_attr_equal(vif_old->config, vif_new->config)) {
                        free(vif_new);
                        return;
@@ -556,6 +567,7 @@ wireless_device_check_script_tasks(struct uloop_timeout *timeout)
                if (wireless_process_check(proc))
                        continue;
 
+               D(WIRELESS, "Wireless device '%s' pid %d has terminated\n", wdev->name, proc->pid);
                if (proc->required)
                        restart = true;
 
@@ -604,7 +616,7 @@ wireless_device_create(struct wireless_driver *drv, const char *name, struct blo
        wdev->script_check.cb = wireless_device_check_script_tasks;
 }
 
-void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *data)
+void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *data, const char *section)
 {
        struct wireless_interface *vif;
        struct blob_attr *tb[__VIF_ATTR_MAX];
@@ -624,6 +636,7 @@ void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *d
        vif->name = strcpy(name_buf, name);
        vif->wdev = wdev;
        vif->config = data;
+       vif->section = section;
        vlist_add(&wdev->interfaces, &vif->node, vif->name);
 }
 
@@ -633,6 +646,10 @@ wireless_interface_status(struct wireless_interface *iface, struct blob_buf *b)
        void *i;
 
        i = blobmsg_open_table(b, iface->name);
+       if (iface->section)
+               blobmsg_add_string(b, "section", iface->section);
+       if (iface->ifname)
+               blobmsg_add_string(b, "ifname", iface->ifname);
        if (iface->data)
                blob_put_raw(b, blob_data(iface->data), blob_len(iface->data));
        blobmsg_close_table(b, i);
@@ -692,6 +709,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;
@@ -700,15 +718,20 @@ 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])
                proc->required = blobmsg_get_bool(tb[PROC_ATTR_REQUIRED]);
 
+       D(WIRELESS, "Wireless device '%s' add pid %d\n", wdev->name, proc->pid);
        list_add(&proc->list, &wdev->script_proc);
        uloop_timeout_set(&wdev->script_check, 0);
 
@@ -739,7 +762,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;