add some code for parsing static ipaddr/ip6addr/netmask

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index ba7b5e5..ef176f6 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -81,7 +81,7 @@ __set_interface_up(struct interface *iface)
                return ret;
 
        iface->state = IFS_SETUP;
-       ret = iface->proto->handler(iface->proto, PROTO_CMD_SETUP, false);
+       ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
        if (ret) {
                mark_interface_down(iface);
                return ret;
@@ -103,8 +103,7 @@ __set_interface_down(struct interface *iface, bool force)
        iface->state = IFS_TEARDOWN;
        interface_event(iface, IFEV_DOWN);
 
-       iface->proto->handler(iface->proto, PROTO_CMD_TEARDOWN, force);
-       release_device(iface->main_dev.dev);
+       interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
 }
 
 static void
@@ -131,7 +130,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);
@@ -162,7 +161,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
 {
        if (iface->proto) {
-               iface->proto->handler(iface->proto, PROTO_CMD_TEARDOWN, true);
+               interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, true);
                iface->proto->free(iface->proto);
                iface->proto = NULL;
        }
@@ -176,7 +175,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,19 +184,14 @@ 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);
 
+       proto_attach_interface(iface, s);
+
        netifd_ubus_add_interface(iface);
 
        return iface;
@@ -278,3 +272,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);
+       }
+}