bridge: Fix multicast_to_unicast feature by hairpin+isolate

[project/netifd.git] / wireless.c

diff --git a/wireless.c b/wireless.c
index c9443bd..337f563 100644 (file)
--- a/wireless.c
+++ b/wireless.c
@@ -35,12 +35,14 @@ static const struct uci_blob_param_list wdev_param = {
 enum {
        VIF_ATTR_DISABLED,
        VIF_ATTR_NETWORK,
+       VIF_ATTR_ISOLATE,
        __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 },
 };
 
 static const struct uci_blob_param_list vif_param = {
@@ -204,8 +206,10 @@ static void wireless_interface_handle_link(struct wireless_interface *vif, bool
 
        if (up) {
                struct device *dev = device_get(vif->ifname, 2);
-               if (dev)
+               if (dev) {
+                       dev->wireless_isolate = vif->isolate;
                        dev->wireless = true;
+               }
        }
 
        blobmsg_for_each_attr(cur, vif->network, rem) {
@@ -240,8 +244,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;
@@ -273,6 +283,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);
 }
@@ -283,6 +295,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);
 }
 
@@ -422,6 +435,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;
@@ -429,6 +452,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;
 
@@ -544,7 +568,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;
@@ -557,10 +582,12 @@ vif_update(struct vlist_tree *tree, struct vlist_node *node_new,
                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);
        }
@@ -660,7 +687,7 @@ void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *d
        struct wireless_interface *vif;
        struct blob_attr *tb[__VIF_ATTR_MAX];
        struct blob_attr *cur;
-       char *name_buf, *section_buf;
+       char *name_buf;
        char name[8];
 
        blobmsg_parse(vif_policy, __VIF_ATTR_MAX, tb, blob_data(data), blob_len(data));
@@ -672,12 +699,17 @@ 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,
-                      &section_buf, strlen(section) + 1);
+                      &name_buf, strlen(name) + 1);
        vif->name = strcpy(name_buf, name);
        vif->wdev = wdev;
        vif->config = data;
-       vif->section = strcpy(section_buf, section);
+       vif->section = section;
+       vif->isolate = false;
+
+       cur = tb[VIF_ATTR_ISOLATE];
+       if (cur && blobmsg_get_bool(cur))
+               vif->isolate = blobmsg_get_bool(cur);
+
        vlist_add(&wdev->interfaces, &vif->node, vif->name);
 }