nterface-ip: remove superfluous iface check in interface_ip_set_enabled()
[project/netifd.git] / wireless.c
index c9443bd..387f4ba 100644 (file)
@@ -35,12 +35,16 @@ static const struct uci_blob_param_list wdev_param = {
 enum {
        VIF_ATTR_DISABLED,
        VIF_ATTR_NETWORK,
 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_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 = {
 };
 
 static const struct uci_blob_param_list vif_param = {
@@ -79,7 +83,7 @@ vif_config_add_bridge(struct blob_buf *buf, struct blob_attr *networks, bool pre
                if (!dev)
                        return;
 
                if (!dev)
                        return;
 
-               if (dev->type != &bridge_device_type)
+               if (!dev->type->bridge_capability)
                        return;
        }
 
                        return;
        }
 
@@ -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);
                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
 }
 
 static void
@@ -204,8 +212,11 @@ static void wireless_interface_handle_link(struct wireless_interface *vif, bool
 
        if (up) {
                struct device *dev = device_get(vif->ifname, 2);
 
        if (up) {
                struct device *dev = device_get(vif->ifname, 2);
-               if (dev)
+               if (dev) {
+                       dev->wireless_isolate = vif->isolate;
                        dev->wireless = true;
                        dev->wireless = true;
+                       dev->wireless_ap = vif->ap_mode;
+               }
        }
 
        blobmsg_for_each_attr(cur, vif->network, rem) {
        }
 
        blobmsg_for_each_attr(cur, vif->network, rem) {
@@ -240,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);
        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;
 
        argv[i++] = wdev->drv->script;
        argv[i++] = wdev->drv->name;
@@ -270,9 +287,17 @@ __wireless_device_set_up(struct wireless_device *wdev)
        if (wdev->disabled)
                return;
 
        if (wdev->disabled)
                return;
 
+       if (wdev->retry_setup_failed)
+               return;
+
+       if (!wdev->autostart)
+               return;
+
        if (wdev->state != IFS_DOWN || config_init)
                return;
 
        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);
 }
        wdev->state = IFS_SETUP;
        wireless_device_run_handler(wdev, true);
 }
@@ -283,6 +308,7 @@ wireless_device_free(struct wireless_device *wdev)
        vlist_flush_all(&wdev->interfaces);
        avl_delete(&wireless_devices.avl, &wdev->node.avl);
        free(wdev->config);
        vlist_flush_all(&wdev->interfaces);
        avl_delete(&wireless_devices.avl, &wdev->node.avl);
        free(wdev->config);
+       free(wdev->prev_config);
        free(wdev);
 }
 
        free(wdev);
 }
 
@@ -294,9 +320,9 @@ wdev_handle_config_change(struct wireless_device *wdev)
        switch(state) {
        case IFC_NORMAL:
        case IFC_RELOAD:
        switch(state) {
        case IFC_NORMAL:
        case IFC_RELOAD:
+               __wireless_device_set_up(wdev);
+
                wdev->config_state = IFC_NORMAL;
                wdev->config_state = IFC_NORMAL;
-               if (wdev->autostart)
-                       __wireless_device_set_up(wdev);
                break;
        case IFC_REMOVE:
                wireless_device_free(wdev);
                break;
        case IFC_REMOVE:
                wireless_device_free(wdev);
@@ -379,7 +405,7 @@ wireless_device_retry_setup(struct wireless_device *wdev)
                return;
 
        if (--wdev->retry < 0)
                return;
 
        if (--wdev->retry < 0)
-               wdev->autostart = false;
+               wdev->retry_setup_failed = true;
 
        __wireless_device_set_down(wdev);
 }
 
        __wireless_device_set_down(wdev);
 }
@@ -404,6 +430,7 @@ wireless_device_script_task_cb(struct netifd_process *proc, int ret)
 void
 wireless_device_set_down(struct wireless_device *wdev)
 {
 void
 wireless_device_set_down(struct wireless_device *wdev)
 {
+       wdev->retry_setup_failed = false;
        wdev->autostart = false;
        __wireless_device_set_down(wdev);
 }
        wdev->autostart = false;
        __wireless_device_set_down(wdev);
 }
@@ -422,6 +449,16 @@ wdev_set_config_state(struct wireless_device *wdev, enum interface_config_state
 }
 
 static void
 }
 
 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;
 wdev_change_config(struct wireless_device *wdev, struct wireless_device *wd_new)
 {
        struct blob_attr *new_config = wd_new->config;
@@ -429,6 +466,7 @@ wdev_change_config(struct wireless_device *wdev, struct wireless_device *wd_new)
 
        free(wd_new);
 
 
        free(wd_new);
 
+       wdev_prepare_prev_config(wdev);
        if (blob_attr_equal(wdev->config, new_config) && wdev->disabled == disabled)
                return;
 
        if (blob_attr_equal(wdev->config, new_config) && wdev->disabled == disabled)
                return;
 
@@ -436,6 +474,7 @@ wdev_change_config(struct wireless_device *wdev, struct wireless_device *wd_new)
        free(wdev->config);
        wdev->config = blob_memdup(new_config);
        wdev->disabled = disabled;
        free(wdev->config);
        wdev->config = blob_memdup(new_config);
        wdev->disabled = disabled;
+       wdev->retry_setup_failed = false;
        wdev_set_config_state(wdev, IFC_RELOAD);
 }
 
        wdev_set_config_state(wdev, IFC_RELOAD);
 }
 
@@ -528,6 +567,14 @@ wireless_interface_init_config(struct wireless_interface *vif)
 
        if ((cur = tb[VIF_ATTR_NETWORK]))
                vif->network = cur;
 
        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
 }
 
 static void
@@ -544,23 +591,30 @@ vif_update(struct vlist_tree *tree, struct vlist_node *node_new,
                wdev = vif_new->wdev;
 
        if (vif_old && vif_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;
                }
 
                D(WIRELESS, "Update wireless interface %s on device %s\n", vif_new->name, wdev->name);
                if (blob_attr_equal(vif_old->config, vif_new->config)) {
                        free(vif_new);
                        return;
                }
 
                D(WIRELESS, "Update wireless interface %s on device %s\n", vif_new->name, wdev->name);
+               wireless_interface_handle_link(vif_old, false);
                free(vif_old->config);
                vif_old->config = blob_memdup(vif_new->config);
                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);
                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);
                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);
+               wireless_interface_handle_link(vif_old, false);
+               free((void *) vif_old->section);
                free(vif_old->config);
                free(vif_old);
        }
                free(vif_old->config);
                free(vif_old);
        }
@@ -636,8 +690,8 @@ wireless_device_create(struct wireless_driver *drv, const char *name, struct blo
        wdev->config_state = IFC_NORMAL;
        wdev->name = strcpy(name_buf, name);
        wdev->config = data;
        wdev->config_state = IFC_NORMAL;
        wdev->name = strcpy(name_buf, name);
        wdev->config = data;
-       wdev->config_autostart = true;
-       wdev->autostart = wdev->config_autostart;
+       wdev->retry_setup_failed = false;
+       wdev->autostart = true;
        INIT_LIST_HEAD(&wdev->script_proc);
        vlist_init(&wdev->interfaces, avl_strcmp, vif_update);
        wdev->interfaces.keep_old = true;
        INIT_LIST_HEAD(&wdev->script_proc);
        vlist_init(&wdev->interfaces, avl_strcmp, vif_update);
        wdev->interfaces.keep_old = true;
@@ -660,7 +714,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;
        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));
        char name[8];
 
        blobmsg_parse(vif_policy, __VIF_ATTR_MAX, tb, blob_data(data), blob_len(data));
@@ -672,12 +726,13 @@ void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *d
        sprintf(name, "%d", wdev->vif_idx++);
 
        vif = calloc_a(sizeof(*vif),
        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->name = strcpy(name_buf, name);
        vif->wdev = wdev;
        vif->config = data;
-       vif->section = strcpy(section_buf, section);
+       vif->section = section;
+       vif->isolate = false;
+
        vlist_add(&wdev->interfaces, &vif->node, vif->name);
 }
 
        vlist_add(&wdev->interfaces, &vif->node, vif->name);
 }
 
@@ -706,6 +761,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);
        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);
+       blobmsg_add_u8(b, "retry_setup_failed", wdev->retry_setup_failed);
        put_container(b, wdev->config, "config");
 
        i = blobmsg_open_array(b, "interfaces");
        put_container(b, wdev->config, "config");
 
        i = blobmsg_open_array(b, "interfaces");
@@ -945,6 +1001,5 @@ wireless_start_pending(void)
        struct wireless_device *wdev;
 
        vlist_for_each_element(&wireless_devices, wdev, node)
        struct wireless_device *wdev;
 
        vlist_for_each_element(&wireless_devices, wdev, node)
-               if (wdev->autostart)
-                       __wireless_device_set_up(wdev);
+               __wireless_device_set_up(wdev);
 }
 }