X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-manager.c;h=ce97ac0778ca7e6a25698bd364ed301dd11ab9e5;hb=484adfd914504cd7e95867cea20ca7af71b888f2;hp=40328a36c95de117f0c1a751ba0f3d3b8f23a94e;hpb=e331e24649213f2e093e16e4d3d64ee823dfc375;p=elogind.git diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 40328a36c..ce97ac077 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -31,6 +31,8 @@ #include "libudev-private.h" #include "udev-util.h" #include "rtnl-util.h" +#include "bus-util.h" +#include "def.h" #include "mkdir.h" #include "virt.h" @@ -76,8 +78,6 @@ static int setup_default_address_pool(Manager *m) { return 0; } -int manager_connect_bus(Manager *m); - static int on_bus_retry(sd_event_source *s, usec_t usec, void *userdata) { Manager *m = userdata; @@ -174,6 +174,14 @@ int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to add link enumerator: %m"); + r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/network1/network", "org.freedesktop.network1.Network", network_vtable, network_object_find, m); + if (r < 0) + return log_error_errno(r, "Failed to add network object vtable: %m"); + + r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/network1/network", network_node_enumerator, m); + if (r < 0) + return log_error_errno(r, "Failed to add network enumerator: %m"); + r = sd_bus_request_name(m->bus, "org.freedesktop.network1", 0); if (r < 0) return log_error_errno(r, "Failed to register name: %m"); @@ -435,10 +443,6 @@ int manager_new(Manager **ret) { if (r < 0) return r; - r = manager_connect_bus(m); - if (r < 0) - return r; - r = manager_connect_udev(m); if (r < 0) return r; @@ -485,6 +489,8 @@ void manager_free(Manager *m) { while ((network = m->networks)) network_free(network); + hashmap_free(m->networks_by_name); + while ((netdev = hashmap_first(m->netdevs))) netdev_unref(netdev); hashmap_free(m->netdevs); @@ -497,6 +503,51 @@ void manager_free(Manager *m) { free(m); } +static bool manager_check_idle(void *userdata) { + Manager *m = userdata; + Link *link; + Iterator i; + + assert(m); + + HASHMAP_FOREACH(link, m->links, i) { + /* we are not woken on udev activity, so let's just wait for the + * pending udev event */ + if (link->state == LINK_STATE_PENDING) + return false; + + if (!link->network) + continue; + + /* we are not woken on netork activity, so let's stay around */ + if (link_lldp_enabled(link) || + link_ipv4ll_enabled(link) || + link_dhcp4_server_enabled(link) || + link_dhcp4_enabled(link) || + link_dhcp6_enabled(link)) + return false; + } + + return true; +} + +int manager_run(Manager *m) { + assert(m); + + if (m->bus) + return bus_event_loop_with_idle( + m->event, + m->bus, + "org.freedesktop.network1", + DEFAULT_EXIT_USEC, + manager_check_idle, + m); + else + /* failed to connect to the bus, so we lose exit-on-idle logic, + this should not happen except if dbus is not around at all */ + return sd_event_loop(m->event); +} + int manager_load_config(Manager *m) { int r;