Revert "vlan: reset device state on init"

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index 4fe72dc..4e91e18 100644 (file)
--- a/config.c
+++ b/config.c
@@ -11,6 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -33,6 +34,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 +76,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)
@@ -81,7 +105,7 @@ config_parse_interface(struct uci_section *s, bool alias)
        if (iface->proto_handler && iface->proto_handler->config_params)
                uci_to_blob(&b, s, iface->proto_handler->config_params);
 
-       if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params))
+       if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params) > 1)
                iface->device_config = true;
 
        config = blob_memdup(b.head);
@@ -112,7 +136,8 @@ config_parse_interface(struct uci_section *s, bool alias)
        if (blob_len(b.head) == 0)
                return;
 
-       device_set_config(dev, dev->type, b.head);
+       if (iface->device_config && dev->default_config)
+               device_set_config(dev, dev->type, b.head);
        return;
 error_free_config:
        free(config);
@@ -150,8 +175,10 @@ config_init_devices(void)
        struct uci_element *e;
 
        uci_foreach_element(&uci_network->sections, e) {
+               const struct uci_blob_param_list *params = NULL;
                struct uci_section *s = uci_to_section(e);
                const struct device_type *devtype = NULL;
+               struct device *dev;
                const char *type, *name;
 
                if (strcmp(s->type, "device") != 0)
@@ -163,20 +190,37 @@ 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)
-                       devtype = &simple_device_type;
+               if (devtype)
+                       params = devtype->config_params;
+               if (!params)
+                       params = simple_device_type.config_params;
 
                blob_buf_init(&b, 0);
-               uci_to_blob(&b, s, devtype->config_params);
-               device_create(name, devtype, b.head);
+               uci_to_blob(&b, s, params);
+               if (devtype) {
+                       dev = device_create(name, devtype, b.head);
+                       if (!dev)
+                               continue;
+               } else {
+                       dev = device_get(name, 1);
+                       if (!dev)
+                               continue;
+
+                       device_apply_config(dev, dev->type, b.head);
+               }
+               dev->default_config = false;
        }
 }
 
@@ -190,6 +234,7 @@ 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);
 
@@ -304,9 +349,14 @@ config_parse_wireless_device(struct uci_section *s)
 static void
 config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
 {
+       char *name;
+
+       name = alloca(strlen(s->type) + 16);
+       sprintf(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, s->e.name);
+       wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name);
 }
 
 static void