wireless: fix blob buf in put_container()

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index bb0cd05..9fb9c01 100644 (file)
--- a/config.c
+++ b/config.c
@@ -33,6 +33,25 @@ static struct uci_package *uci_wireless;
 static struct blob_buf b;
 
 static int
+config_section_idx(struct uci_section *s)
+{
+       struct uci_element *e;
+       int idx = 0;
+
+       uci_foreach_element(&uci_wireless->sections, e) {
+               struct uci_section *cur = uci_to_section(e);
+
+               if (s == cur)
+                       return idx;
+
+               if (!strcmp(cur->type, s->type))
+                       idx++;
+       }
+
+       return -1;
+}
+
+static int
 config_parse_bridge_interface(struct uci_section *s)
 {
        char *name;
@@ -56,11 +75,15 @@ static void
 config_parse_interface(struct uci_section *s, bool alias)
 {
        struct interface *iface;
-       const char *type = NULL;
+       const char *type = NULL, *disabled;
        struct blob_attr *config;
        struct device *dev;
        bool bridge = false;
 
+       disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
+       if (disabled && !strcmp(disabled, "1"))
+               return;
+
        blob_buf_init(&b, 0);
 
        if (!alias)
@@ -163,12 +186,16 @@ config_init_devices(void)
 
                type = uci_lookup_option_string(uci_ctx, s, "type");
                if (type) {
-                       if (!strcmp(type, "bridge"))
+                       if (!strcmp(type, "8021ad"))
+                               devtype = &vlandev_device_type;
+                       else if (!strcmp(type, "8021q"))
+                               devtype = &vlandev_device_type;
+                       else if (!strcmp(type, "bridge"))
                                devtype = &bridge_device_type;
-                       else if (!strcmp(type, "tunnel"))
-                               devtype = &tunnel_device_type;
                        else if (!strcmp(type, "macvlan"))
                                devtype = &macvlan_device_type;
+                       else if (!strcmp(type, "tunnel"))
+                               devtype = &tunnel_device_type;
                }
 
                if (!devtype)
@@ -190,8 +217,11 @@ config_init_package(const char *config)
                ctx = uci_alloc_context();
                uci_ctx = ctx;
 
+               ctx->flags &= ~UCI_FLAG_STRICT;
+               if (config_path)
+                       uci_set_confdir(ctx, config_path);
+
 #ifdef DUMMY_MODE
-               uci_set_confdir(ctx, "./config");
                uci_set_savedir(ctx, "./tmp");
 #endif
        } else {
@@ -302,9 +332,16 @@ config_parse_wireless_device(struct uci_section *s)
 static void
 config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
 {
+       char *name = NULL;
+
+       if (s->anonymous) {
+               name = alloca(strlen(s->type) + 16);
+               asprintf(&name, "@%s[%d]", s->type, config_section_idx(s));
+       }
+
        blob_buf_init(&b, 0);
        uci_to_blob(&b, s, wdev->drv->interface.config);
-       wireless_interface_create(wdev, b.head);
+       wireless_interface_create(wdev, b.head, name ? name : s->e.name);
 }
 
 static void