fix flushing routes/addresses on connection loss

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index c5addea..4605a66 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -142,6 +142,8 @@ mark_interface_down(struct interface *iface)
 {
        if (iface->state == IFS_UP)
                interface_event(iface, IFEV_DOWN);
+       interface_ip_flush(&iface->config_ip);
+       interface_ip_flush(&iface->proto_ip);
        interface_flush_state(iface);
        iface->state = IFS_DOWN;
 }
@@ -158,8 +160,6 @@ __interface_set_down(struct interface *iface, bool force)
        if (iface->state == IFS_UP)
                interface_event(iface, IFEV_DOWN);
        iface->state = IFS_TEARDOWN;
-       interface_ip_flush(&iface->config_ip);
-       interface_ip_flush(&iface->proto_ip);
        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
        if (force)
                interface_flush_state(iface);
@@ -242,6 +242,7 @@ interface_cleanup(struct interface *iface, bool reload)
        list_for_each_entry_safe(dep, tmp, &iface->users, list)
                interface_remove_user(dep);
 
+       interface_dequeue_event(iface);
        interface_ip_flush(&iface->config_ip);
        interface_flush_state(iface);
        interface_clear_errors(iface);
@@ -310,8 +311,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 
                netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
                interface_ip_set_enabled(&iface->config_ip, false);
-               system_flush_routes();
                mark_interface_down(iface);
+               system_flush_routes();
                interface_handle_config_change(iface);
                break;
        case IFPEV_LINK_LOST:
@@ -321,6 +322,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name);
                if (iface->state == IFS_UP)
                        interface_event(iface, IFEV_DOWN);
+               mark_interface_down(iface);
+               system_flush_routes();
                iface->state = IFS_SETUP;
                break;
        }
@@ -420,10 +423,10 @@ interface_set_main_dev(struct interface *iface, struct device *dev)
        if (iface->main_dev.dev == dev)
                return;
 
-       device_add_user(&iface->main_dev, dev);
        if (set_l3)
                interface_set_l3_dev(iface, dev);
 
+       device_add_user(&iface->main_dev, dev);
        if (claimed)
                device_claim(&iface->l3_dev);