static void
put_container(struct blob_buf *buf, struct blob_attr *attr, const char *name)
{
- void *c = blobmsg_open_table(&b, name);
- blob_put_raw(&b, blob_data(attr), blob_len(attr));
- blobmsg_close_table(&b, c);
+ void *c = blobmsg_open_table(buf, name);
+ blob_put_raw(buf, blob_data(attr), blob_len(attr));
+ blobmsg_close_table(buf, c);
}
static void
if (!iface)
continue;
- interface_handle_link(iface, vif->ifname, up);
+ interface_handle_link(iface, vif->ifname, up, true);
}
}
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);
+ if (!up && wdev->prev_config) {
+ config = blobmsg_format_json(wdev->prev_config, true);
+ free(wdev->prev_config);
+ wdev->prev_config = NULL;
+ } else {
+ prepare_config(wdev, &b, up);
+ config = blobmsg_format_json(b.head, true);
+ }
argv[i++] = wdev->drv->script;
argv[i++] = wdev->drv->name;
if (wdev->state != IFS_DOWN || config_init)
return;
+ free(wdev->prev_config);
+ wdev->prev_config = NULL;
wdev->state = IFS_SETUP;
wireless_device_run_handler(wdev, true);
}
vlist_flush_all(&wdev->interfaces);
avl_delete(&wireless_devices.avl, &wdev->node.avl);
free(wdev->config);
+ free(wdev->prev_config);
free(wdev);
}
}
static void
+wdev_prepare_prev_config(struct wireless_device *wdev)
+{
+ if (wdev->prev_config)
+ return;
+
+ prepare_config(wdev, &b, false);
+ wdev->prev_config = blob_memdup(b.head);
+}
+
+static void
wdev_change_config(struct wireless_device *wdev, struct wireless_device *wd_new)
{
struct blob_attr *new_config = wd_new->config;
free(wd_new);
+ wdev_prepare_prev_config(wdev);
if (blob_attr_equal(wdev->config, new_config) && wdev->disabled == disabled)
return;
wdev = vif_new->wdev;
if (vif_old && vif_new) {
- vif_old->section = vif_new->section;
+ free((void *) vif_old->section);
+ vif_old->section = strdup(vif_new->section);
if (blob_attr_equal(vif_old->config, vif_new->config)) {
free(vif_new);
return;
free(vif_new);
} else if (vif_new) {
D(WIRELESS, "Create new wireless interface %s on device %s\n", vif_new->name, wdev->name);
+ vif_new->section = strdup(vif_new->section);
vif_new->config = blob_memdup(vif_new->config);
wireless_interface_init_config(vif_new);
} else if (vif_old) {
D(WIRELESS, "Delete wireless interface %s on device %s\n", vif_old->name, wdev->name);
+ free((void *) vif_old->section);
free(vif_old->config);
free(vif_old);
}
sprintf(name, "%d", wdev->vif_idx++);
- vif = calloc_a(sizeof(*vif), &name_buf, strlen(name) + 1);
+ vif = calloc_a(sizeof(*vif),
+ &name_buf, strlen(name) + 1);
vif->name = strcpy(name_buf, name);
vif->wdev = wdev;
vif->config = data;
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));
+ put_container(b, iface->config, "config");
blobmsg_close_table(b, i);
}
blobmsg_add_u8(b, "pending", wdev->state == IFS_SETUP || wdev->state == IFS_TEARDOWN);
blobmsg_add_u8(b, "autostart", wdev->autostart);
blobmsg_add_u8(b, "disabled", wdev->disabled);
+ put_container(b, wdev->config, "config");
i = blobmsg_open_array(b, "interfaces");
vlist_for_each_element(&wdev->interfaces, iface, node)