clear all remaining addresses on interface down

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index a947cf6..0a53151 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -26,7 +26,7 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 {
        struct interface_error *error;
        int i, len = 0;
-       int *datalen;
+       int *datalen = NULL;
        char *dest;
 
        if (n_data) {
@@ -64,6 +64,7 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 mark_interface_down(struct interface *iface)
 {
+       interface_del_ctx_addr(iface, NULL);
        release_device(iface->main_dev.dev);
        iface->state = IFS_DOWN;
 }
@@ -104,7 +105,6 @@ __set_interface_down(struct interface *iface, bool force)
        interface_event(iface, IFEV_DOWN);
 
        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
-       release_device(iface->main_dev.dev);
 }
 
 static void
@@ -131,7 +131,7 @@ interface_cb(struct device_user *dep, enum device_event ev)
        iface->active = new_state;
 
        if (new_state) {
-               if (iface->autostart)
+               if (iface->autostart && !config_init)
                        set_interface_up(iface);
        } else
                __set_interface_down(iface, true);
@@ -176,7 +176,7 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 }
 
 struct interface *
-alloc_interface(const char *name)
+alloc_interface(const char *name, struct uci_section *s)
 {
        struct interface *iface;
 
@@ -185,18 +185,15 @@ alloc_interface(const char *name)
                return iface;
 
        iface = calloc(1, sizeof(*iface));
-
-       interface_set_proto_state(iface, get_default_proto());
-       if (!iface->proto) {
-               free(iface);
-               return NULL;
-       }
-
        iface->main_dev.cb = interface_cb;
        iface->l3_iface = &iface->main_dev;
        strncpy(iface->name, name, sizeof(iface->name) - 1);
        list_add(&iface->list, &interfaces);
        INIT_LIST_HEAD(&iface->errors);
+       INIT_LIST_HEAD(&iface->address);
+       INIT_LIST_HEAD(&iface->routes);
+
+       proto_attach_interface(iface, s);
 
        netifd_ubus_add_interface(iface);
 
@@ -278,3 +275,14 @@ set_interface_down(struct interface *iface)
 
        return 0;
 }
+
+void
+start_pending_interfaces(void)
+{
+       struct interface *iface;
+
+       list_for_each_entry(iface, &interfaces, list) {
+               if (iface->active && iface->autostart)
+                       set_interface_up(iface);
+       }
+}