Initialize wireless interface attributes in proper function

[project/netifd.git] / wireless.c

diff --git a/wireless.c b/wireless.c
index 337f563..1f96089 100644 (file)
--- a/wireless.c
+++ b/wireless.c
@@ -36,6 +36,7 @@ enum {
        VIF_ATTR_DISABLED,
        VIF_ATTR_NETWORK,
        VIF_ATTR_ISOLATE,
+       VIF_ATTR_MODE,
        __VIF_ATTR_MAX,
 };
 
@@ -43,6 +44,7 @@ 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 = {
@@ -92,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
@@ -209,6 +215,7 @@ static void wireless_interface_handle_link(struct wireless_interface *vif, bool
                if (dev) {
                        dev->wireless_isolate = vif->isolate;
                        dev->wireless = true;
+                       dev->wireless_ap = vif->ap_mode;
                }
        }
 
@@ -552,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
@@ -578,6 +593,8 @@ 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) {
@@ -706,10 +723,6 @@ void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *d
        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);
 }