rework and fix hotplug interface handling

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 0a85e6f..8e42f21 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -79,6 +79,11 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 static void
 interface_event(struct interface *iface, enum interface_event ev)
 {
+       struct interface_user *dep, *tmp;
+
+       list_for_each_entry_safe(dep, tmp, &iface->users, list)
+               dep->cb(dep, IFEV_UP);
+
        interface_queue_event(iface, ev);
 }
 
@@ -115,10 +120,9 @@ __interface_set_up(struct interface *iface)
        }
 
        return 0;
-
 }
 
-static void
+void
 __interface_set_down(struct interface *iface, bool force)
 {
        interface_clear_errors(iface);
@@ -169,12 +173,28 @@ interface_set_available(struct interface *iface, bool new_state)
                __interface_set_down(iface, true);
 }
 
+void
+interface_add_user(struct interface_user *dep, struct interface *iface)
+{
+       dep->iface = iface;
+       list_add(&dep->list, &iface->users);
+       if (iface->state == IFS_UP)
+               dep->cb(dep, IFEV_UP);
+}
+
+void
+interface_remove_user(struct interface_user *dep)
+{
+       list_del_init(&dep->list);
+       dep->iface = NULL;
+}
+
 static void
 interface_claim_device(struct interface *iface)
 {
        struct device *dev;
 
-       if (iface->proto_handler &&
+       if (iface->ifname && iface->proto_handler &&
                !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
                dev = device_get(iface->ifname, true);
                if (dev)
@@ -186,10 +206,17 @@ interface_claim_device(struct interface *iface)
 static void
 interface_cleanup(struct interface *iface)
 {
+       struct interface_user *dep, *tmp;
+
+       iface->hotplug_dev = false;
+       list_for_each_entry_safe(dep, tmp, &iface->users, list)
+               interface_remove_user(dep);
+
        interface_clear_dns(iface);
        interface_clear_errors(iface);
        if (iface->main_dev.dev)
                device_remove_user(&iface->main_dev);
+       iface->l3_dev = &iface->main_dev;
        interface_set_proto_state(iface, NULL);
 }
 
@@ -240,24 +267,31 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                if (iface->state != IFS_SETUP)
                        return;
 
+               system_flush_routes();
                iface->state = IFS_UP;
                iface->start_time = system_get_rtime();
                interface_event(iface, IFEV_UP);
                interface_write_resolv_conf();
+               netifd_log_message(L_NOTICE, "Interface '%s' is now up\n", iface->name);
                break;
        case IFPEV_DOWN:
                if (iface->state == IFS_DOWN)
                        return;
 
+               netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
+               system_flush_routes();
                mark_interface_down(iface);
                interface_handle_config_change(iface);
-               if (iface->autostart)
+               if (iface->l3_dev->dev)
+                       device_release(iface->l3_dev);
+               if (iface->autostart && iface->available)
                        __interface_set_up(iface);
                break;
        case IFPEV_LINK_LOST:
                if (iface->state != IFS_UP)
                        return;
 
+               netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name);
                iface->state = IFS_SETUP;
                interface_event(iface, IFEV_DOWN);
                break;
@@ -289,6 +323,7 @@ interface_init(struct interface *iface, const char *name,
 
        strncpy(iface->name, name, sizeof(iface->name) - 1);
        INIT_LIST_HEAD(&iface->errors);
+       INIT_LIST_HEAD(&iface->users);
        INIT_LIST_HEAD(&iface->hotplug_list);
        INIT_LIST_HEAD(&iface->proto_dns_search);
        INIT_LIST_HEAD(&iface->proto_dns_servers);
@@ -361,14 +396,15 @@ interface_set_up(struct interface *iface)
 {
        iface->autostart = true;
 
+       if (iface->state != IFS_DOWN)
+               return 0;
+
+       interface_clear_errors(iface);
        if (!iface->available) {
                interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
                return -1;
        }
 
-       if (iface->state != IFS_DOWN)
-               return 0;
-
        return __interface_set_up(iface);
 }