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);
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);
{
struct wireless_interface *vif;
+ uloop_timeout_cancel(&wdev->timeout);
wireless_complete_kill_request(wdev);
free(wdev->data);
wdev->data = NULL;
if (wdev->cancel)
return;
+ D(WIRELESS, "Cancel wireless device '%s' setup\n", wdev->name);
wdev->cancel = true;
uloop_timeout_set(&wdev->timeout, 10 * 1000);
}
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);
{
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);
wireless_process_kill_all(wdev, SIGTERM, true);
+ wdev->cancel = false;
wdev->state = IFS_DOWN;
wireless_device_free_state(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);
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:
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;
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;
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];
vif->name = strcpy(name_buf, name);
vif->wdev = wdev;
vif->config = data;
+ vif->section = section;
vlist_add(&wdev->interfaces, &vif->node, vif->name);
}
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)
struct blob_attr *tb[__PROC_ATTR_MAX];
struct wireless_process *proc;
char *name;
+ int pid;
if (!data)
return UBUS_STATUS_INVALID_ARGUMENT;
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);
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;