rework and fix hotplug interface handling

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 7c8a0c2..8e42f21 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -122,7 +122,7 @@ __interface_set_up(struct interface *iface)
        return 0;
 }
 
-static void
+void
 __interface_set_down(struct interface *iface, bool force)
 {
        interface_clear_errors(iface);
@@ -194,7 +194,7 @@ 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)
@@ -208,6 +208,7 @@ 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);
 
@@ -271,23 +272,26 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                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)
-                       __interface_set_up(iface);
                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;