discover: Bring down configured interfaces on discover server exit.

We want to down the interfaces that we brought up, so hook up the
network_shutdown function to the discover exit path. Also, we only want
to down interfaces that we've configured, and exclude lo.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/network.c b/discover/network.c
index 7ddecc03b658a59e88e00bfcf9156114ca7f13c6..8cc01833d5875990358ea0bc897eea0bf5ab6fe0 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -582,8 +582,13 @@ int network_shutdown(struct network *network)
        if (network->waiter)
                waiter_remove(network->waiter);
 
-       list_for_each_entry(&network->interfaces, interface, list)
+       list_for_each_entry(&network->interfaces, interface, list) {
+               if (interface->state == IFSTATE_IGNORED)
+                       continue;
+               if (!strcmp(interface->name, "lo"))
+                       continue;
                interface_down(interface);
+       }
 
        close(network->netlink_sd);
        talloc_free(network);

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index b15413090e49fefc34b84ef0f7f0385328994ad5..d8708a3d40194d9d2017d41058a4ed57f8971b6e 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -200,6 +200,7 @@ int main(int argc, char *argv[])
                        break;
        }
 
+       network_shutdown(network);
        device_handler_destroy(handler);
        user_event_destroy(uev);
        udev_destroy(udev);