interface: clean up after hotplug interfaces are removed

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index 8472d44..c5a2d2c 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -143,16 +156,17 @@ config_parse_bridge_interface(struct uci_section *s)
 }
 
 static void
-config_parse_interface(struct uci_section *s)
+config_parse_interface(struct uci_section *s, bool alias)
 {
        struct interface *iface;
-       const char *type;
+       const char *type = NULL;
        struct blob_attr *config;
        struct device *dev;
 
        blob_buf_init(&b, 0);
 
-       type = uci_lookup_option_string(uci_ctx, s, "type");
+       if (!alias)
+               type = uci_lookup_option_string(uci_ctx, s, "type");
        if (type && !strcmp(type, "bridge"))
                if (config_parse_bridge_interface(s))
                        return;
@@ -168,13 +182,17 @@ config_parse_interface(struct uci_section *s)
                uci_to_blob(&b, s, iface->proto_handler->config_params);
 
        config = malloc(blob_pad_len(b.head));
-       if (!config) {
-               free(iface);
-               return;
-       }
+       if (!config)
+               goto error;
 
        memcpy(config, b.head, blob_pad_len(b.head));
-       interface_add(iface, config);
+
+       if (alias) {
+               if (!interface_add_alias(iface, config))
+                       goto error_free_config;
+       } else {
+               interface_add(iface, config);
+       }
 
        /*
         * need to look up the interface name again, in case of config update,
@@ -194,6 +212,11 @@ config_parse_interface(struct uci_section *s)
                return;
 
        device_set_config(dev, dev->type, b.head);
+       return;
+error_free_config:
+       free(config);
+error:
+       free(iface);
 }
 
 static void
@@ -215,7 +238,7 @@ config_init_devices(void)
 
        uci_foreach_element(&uci_network->sections, e) {
                struct uci_section *s = uci_to_section(e);
-               const struct device_type *devtype;
+               const struct device_type *devtype = NULL;
                const char *type, *name;
 
                if (strcmp(s->type, "device") != 0)
@@ -226,9 +249,14 @@ config_init_devices(void)
                        continue;
 
                type = uci_lookup_option_string(uci_ctx, s, "type");
-               if (type && !strcmp(type, "bridge"))
-                       devtype = &bridge_device_type;
-               else
+               if (type) {
+                       if (!strcmp(type, "bridge"))
+                               devtype = &bridge_device_type;
+                       else if (!strcmp(type, "tunnel"))
+                               devtype = &tunnel_device_type;
+               }
+
+               if (!devtype)
                        devtype = &simple_device_type;
 
                blob_buf_init(&b, 0);
@@ -360,7 +388,14 @@ config_init_interfaces(void)
                struct uci_section *s = uci_to_section(e);
 
                if (!strcmp(s->type, "interface"))
-                       config_parse_interface(s);
+                       config_parse_interface(s, false);
+       }
+
+       uci_foreach_element(&uci_network->sections, e) {
+               struct uci_section *s = uci_to_section(e);
+
+               if (!strcmp(s->type, "alias"))
+                       config_parse_interface(s, true);
        }
 }
 
@@ -395,6 +430,7 @@ config_init_all(void)
                return;
        }
 
+       vlist_update(&interfaces);
        config_init = true;
        device_lock();
 
@@ -409,5 +445,6 @@ config_init_all(void)
        device_reset_old();
        device_init_pending();
        device_free_unused(NULL);
+       vlist_flush(&interfaces);
        interface_start_pending();
 }