X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=wireless.c;h=1f96089f73a2b6e398da15fe96df361cfb604ab6;hp=0e293a0783d189581855737d4ec117f7e8679285;hb=638c45755f5750a95a3c305a37b711bd7c580643;hpb=e784303c4ca8ee86e57521a00ef5f9d0e98617f8 diff --git a/wireless.c b/wireless.c index 0e293a0..1f96089 100644 --- a/wireless.c +++ b/wireless.c @@ -35,12 +35,16 @@ static const struct uci_blob_param_list wdev_param = { enum { VIF_ATTR_DISABLED, VIF_ATTR_NETWORK, + VIF_ATTR_ISOLATE, + VIF_ATTR_MODE, __VIF_ATTR_MAX, }; static const struct blobmsg_policy vif_policy[__VIF_ATTR_MAX] = { [VIF_ATTR_DISABLED] = { .name = "disabled", .type = BLOBMSG_TYPE_BOOL }, [VIF_ATTR_NETWORK] = { .name = "network", .type = BLOBMSG_TYPE_ARRAY }, + [VIF_ATTR_ISOLATE] = { .name = "isolate", .type = BLOBMSG_TYPE_BOOL }, + [VIF_ATTR_MODE] = { .name = "mode", .type = BLOBMSG_TYPE_STRING }, }; static const struct uci_blob_param_list vif_param = { @@ -51,9 +55,9 @@ static const struct uci_blob_param_list vif_param = { 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 @@ -90,6 +94,10 @@ vif_config_add_bridge(struct blob_buf *buf, struct blob_attr *networks, bool pre dev->hotplug_ops->prepare(dev); blobmsg_add_string(buf, "bridge", dev->ifname); + + if (dev->settings.flags & DEV_OPT_MULTICAST_TO_UNICAST) + blobmsg_add_u8(buf, "multicast_to_unicast", + dev->settings.multicast_to_unicast); } static void @@ -202,6 +210,15 @@ static void wireless_interface_handle_link(struct wireless_interface *vif, bool if (!vif->network || !vif->ifname) return; + if (up) { + struct device *dev = device_get(vif->ifname, 2); + if (dev) { + dev->wireless_isolate = vif->isolate; + dev->wireless = true; + dev->wireless_ap = vif->ap_mode; + } + } + blobmsg_for_each_attr(cur, vif->network, rem) { network = blobmsg_data(cur); @@ -209,7 +226,7 @@ static void wireless_interface_handle_link(struct wireless_interface *vif, bool if (!iface) continue; - interface_handle_link(iface, vif->ifname, up); + interface_handle_link(iface, vif->ifname, up, true); } } @@ -234,8 +251,14 @@ wireless_device_run_handler(struct wireless_device *wdev, bool up) 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; @@ -267,6 +290,8 @@ __wireless_device_set_up(struct wireless_device *wdev) 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); } @@ -277,6 +302,7 @@ wireless_device_free(struct wireless_device *wdev) vlist_flush_all(&wdev->interfaces); avl_delete(&wireless_devices.avl, &wdev->node.avl); free(wdev->config); + free(wdev->prev_config); free(wdev); } @@ -416,6 +442,16 @@ wdev_set_config_state(struct wireless_device *wdev, enum interface_config_state } 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; @@ -423,6 +459,7 @@ wdev_change_config(struct wireless_device *wdev, struct wireless_device *wd_new) free(wd_new); + wdev_prepare_prev_config(wdev); if (blob_attr_equal(wdev->config, new_config) && wdev->disabled == disabled) return; @@ -522,6 +559,14 @@ wireless_interface_init_config(struct wireless_interface *vif) if ((cur = tb[VIF_ATTR_NETWORK])) vif->network = cur; + + cur = tb[VIF_ATTR_ISOLATE]; + if (cur) + vif->isolate = blobmsg_get_bool(cur); + + cur = tb[VIF_ATTR_MODE]; + if (cur) + vif->ap_mode = !strcmp(blobmsg_get_string(cur), "ap"); } static void @@ -538,7 +583,8 @@ 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; + 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; @@ -547,14 +593,18 @@ vif_update(struct vlist_tree *tree, struct vlist_node *node_new, D(WIRELESS, "Update wireless interface %s on device %s\n", vif_new->name, wdev->name); free(vif_old->config); vif_old->config = blob_memdup(vif_new->config); + vif_old->isolate = vif_new->isolate; + vif_old->ap_mode = vif_new->ap_mode; wireless_interface_init_config(vif_old); 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); } @@ -665,11 +715,14 @@ void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *d 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; vif->section = section; + vif->isolate = false; + vlist_add(&wdev->interfaces, &vif->node, vif->name); } @@ -683,8 +736,7 @@ wireless_interface_status(struct wireless_interface *iface, struct blob_buf *b) 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); } @@ -699,6 +751,7 @@ wireless_device_status(struct wireless_device *wdev, struct blob_buf *b) 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)