diff options
Diffstat (limited to 'src/network/networkd-wait-online.c')
| -rw-r--r-- | src/network/networkd-wait-online.c | 188 |
1 files changed, 15 insertions, 173 deletions
diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c index c4783ca2e9..d588935e93 100644 --- a/src/network/networkd-wait-online.c +++ b/src/network/networkd-wait-online.c @@ -1,4 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -19,23 +18,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <netinet/ether.h> -#include <linux/if.h> #include <getopt.h> -#include "sd-event.h" -#include "event-util.h" -#include "sd-rtnl.h" -#include "rtnl-util.h" #include "sd-daemon.h" -#include "sd-network.h" -#include "network-util.h" -#include "network-internal.h" + #include "networkd-wait-online.h" -#include "conf-parser.h" #include "strv.h" -#include "util.h" #include "build.h" static bool arg_quiet = false; @@ -106,129 +95,16 @@ static int parse_argv(int argc, char *argv[]) { return 1; } -static bool all_configured(Manager *m) { - _cleanup_free_ unsigned *indices = NULL; - char **ifname; - bool one_ready = false; - int r, n, i; - - n = sd_network_get_ifindices(&indices); - if (n <= 0) - return false; - - /* wait for networkd to be aware of all the links given on the commandline */ - STRV_FOREACH(ifname, arg_interfaces) { - _cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL, *reply = NULL; - bool found = false; - int index; - - r = sd_rtnl_message_new_link(m->rtnl, &message, RTM_GETLINK, 0); - if (r < 0) { - log_warning("could not create GETLINK message: %s", strerror(-r)); - return false; - } - - r = sd_rtnl_message_append_string(message, IFLA_IFNAME, *ifname); - if (r < 0) { - log_warning("could not attach ifname to GETLINK message: %s", strerror(-r)); - return false; - } - - r = sd_rtnl_call(m->rtnl, message, 0, &reply); - if (r < 0) { - if (r != -ENODEV) - log_warning("could not get link info for %s: %s", *ifname, - strerror(-r)); - - /* link does not yet exist */ - return false; - } - - r = sd_rtnl_message_link_get_ifindex(reply, &index); - if (r < 0) { - log_warning("could not get ifindex: %s", strerror(-r)); - return false; - } - - if (index <= 0) { - log_warning("invalid ifindex %d for %s", index, *ifname); - return false; - } - - for (i = 0; i < n; i++) { - if (indices[i] == (unsigned) index) { - found = true; - break; - } - } - - if (!found) { - /* link exists, but networkd is not yet aware of it */ - return false; - } - } - - /* wait for all links networkd manages to be in admin state 'configured' - and at least one link to gain a carrier */ - for (i = 0; i < n; i++) { - _cleanup_free_ char *state = NULL, *oper_state = NULL; - - if (sd_network_link_is_loopback(indices[i])) - /* ignore loopback devices */ - continue; - - r = sd_network_get_link_state(indices[i], &state); - if (r == -EBUSY || (r >= 0 && !streq(state, "configured"))) - /* not yet processed by udev, or managed by networkd, but not yet configured */ - return false; - - r = sd_network_get_link_operational_state(indices[i], &oper_state); - if (r >= 0 && - (streq(oper_state, "degraded") || - streq(oper_state, "routable"))) - /* we wait for at least one link to be ready, - regardless of who manages it */ - one_ready = true; - } - - return one_ready; -} - -static int monitor_event_handler(sd_event_source *s, int fd, uint32_t revents, - void *userdata) { - Manager *m = userdata; - - assert(m); - assert(m->event); - - if (all_configured(m)) - sd_event_exit(m->event, 0); - - sd_network_monitor_flush(m->monitor); - - return 1; -} - -void manager_free(Manager *m) { - if (!m) - return; - - sd_event_unref(m->event); - sd_rtnl_unref(m->rtnl); - - free(m); -} - int main(int argc, char *argv[]) { - _cleanup_manager_free_ Manager *m = NULL; - _cleanup_event_source_unref_ sd_event_source *event_source = NULL; - int r, fd, events; - - umask(0022); + _cleanup_(manager_freep) Manager *m = NULL; + int r; + log_set_target(LOG_TARGET_AUTO); log_parse_environment(); log_open(); + umask(0022); + r = parse_argv(argc, argv); if (r <= 0) return r; @@ -236,50 +112,17 @@ int main(int argc, char *argv[]) { if (arg_quiet) log_set_max_level(LOG_WARNING); - m = new0(Manager, 1); - if (!m) - return log_oom(); + assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); - r = sd_event_new(&m->event); + r = manager_new(&m, arg_interfaces); if (r < 0) { - log_error("Could not create event: %s", strerror(-r)); - goto out; + log_error("Could not create manager: %s", strerror(-r)); + goto finish; } - r = sd_rtnl_open(&m->rtnl, 0); - if (r < 0) { - log_error("Could not create rtnl: %s", strerror(-r)); - goto out; - } - - r = sd_network_monitor_new(&m->monitor, NULL); - if (r < 0) { - log_error("Could not create monitor: %s", strerror(-r)); - goto out; - } - - fd = sd_network_monitor_get_fd(m->monitor); - if (fd < 0) { - log_error("Could not get monitor fd: %s", strerror(-r)); - goto out; - } - - events = sd_network_monitor_get_events(m->monitor); - if (events < 0) { - log_error("Could not get monitor events: %s", strerror(-r)); - goto out; - } - - r = sd_event_add_io(m->event, &event_source, fd, events, &monitor_event_handler, - m); - if (r < 0) { - log_error("Could not add io event source: %s", strerror(-r)); - goto out; - } - - if (all_configured(m)) { + if (manager_all_configured(m)) { r = 0; - goto out; + goto finish; } sd_notify(false, @@ -289,12 +132,11 @@ int main(int argc, char *argv[]) { r = sd_event_loop(m->event); if (r < 0) { log_error("Event loop failed: %s", strerror(-r)); - goto out; + goto finish; } -out: - sd_notify(false, - "STATUS=All interfaces configured..."); +finish: + sd_notify(false, "STATUS=All interfaces configured..."); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; } |