rename "active" to "available"

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 387d3491dc602118f7c761e5563810a12c59e253..51e9e92ce34b756bd03c6aa3bbfe2ec3a47c1ee0 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -89,8 +89,8 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 mark_interface_down(struct interface *iface)
 {
-       interface_del_all_routes(iface);
-       interface_del_ctx_addr(iface, NULL);
+       vlist_flush_all(&iface->proto_addr);
+       vlist_flush_all(&iface->proto_route);
        device_release(&iface->main_dev);
        iface->state = IFS_DOWN;
 }
@@ -129,8 +129,6 @@ __interface_set_down(struct interface *iface, bool force)
 
        iface->state = IFS_TEARDOWN;
        interface_event(iface, IFEV_DOWN);
-
-       interface_del_all_routes(iface);
        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
 }
 
@@ -152,10 +150,10 @@ interface_cb(struct device_user *dep, enum device_event ev)
                return;
        }
 
-       if (iface->active == new_state)
+       if (iface->available == new_state)
                return;
 
-       iface->active = new_state;
+       iface->available = new_state;
 
        if (new_state) {
                if (iface->autostart && !config_init)
@@ -221,8 +219,8 @@ interface_alloc(const char *name, struct blob_attr *attr)
        strncpy(iface->name, name, sizeof(iface->name) - 1);
        list_add_tail(&iface->list, &interfaces);
        INIT_LIST_HEAD(&iface->errors);
-       INIT_LIST_HEAD(&iface->address);
-       INIT_LIST_HEAD(&iface->routes);
+
+       interface_ip_init(iface);
 
        blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
                      blob_data(attr), blob_len(attr));
@@ -305,7 +303,7 @@ interface_set_up(struct interface *iface)
 {
        iface->autostart = true;
 
-       if (!iface->active) {
+       if (!iface->available) {
                interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
                return -1;
        }
@@ -331,7 +329,7 @@ interface_start_pending(void)
        struct interface *iface;
 
        list_for_each_entry(iface, &interfaces, list) {
-               if (iface->active && iface->autostart)
+               if (iface->available && iface->autostart)
                        interface_set_up(iface);
        }
 }