X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-wait-online.c;h=a42fef26b99c926ca4f980a317ffda27583d2c53;hb=d91d3c1580ee3c50139eec8ab794c634a54044fb;hp=6a7c62feae544c1c191ebd0609d4aa7ee728be52;hpb=3a67e927e3be7efb8edf314a31aa4f8f5cba4f53;p=elogind.git diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c index 6a7c62fea..a42fef26b 100644 --- a/src/network/networkd-wait-online.c +++ b/src/network/networkd-wait-online.c @@ -21,6 +21,7 @@ #include #include +#include #include "sd-event.h" #include "event-util.h" @@ -35,6 +36,75 @@ #include "conf-parser.h" #include "strv.h" #include "util.h" +#include "build.h" + +static bool arg_quiet = false; +static char **arg_interfaces = NULL; + +static int help(void) { + + printf("%s [OPTIONS...]\n\n" + "Block until network is configured.\n\n" + " -h --help Show this help\n" + " --version Print version string\n" + " -q --quiet Do not show status information\n" + " -i --interface=INTERFACE Block until at least these interfaces have appeared\n", + program_invocation_short_name); + + return 0; +} + +static int parse_argv(int argc, char *argv[]) { + + enum { + ARG_VERSION = 0x100, + }; + + static const struct option options[] = { + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, + { "quiet", no_argument, NULL, 'q' }, + { "interface", required_argument, NULL, 'i' }, + {} + }; + + int c; + + assert(argc >= 0); + assert(argv); + + while ((c = getopt_long(argc, argv, "+hq", options, NULL)) >= 0) { + + switch (c) { + + case 'h': + return help(); + + case 'q': + arg_quiet = true; + break; + + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); + return 0; + + case 'i': + if (strv_extend(&arg_interfaces, optarg) < 0) + return log_oom(); + + break; + + case '?': + return -EINVAL; + + default: + assert_not_reached("Unhandled option"); + } + } + + return 1; +} static bool all_configured(Manager *m) { _cleanup_free_ unsigned *indices = NULL; @@ -46,7 +116,8 @@ static bool all_configured(Manager *m) { if (n <= 0) return false; - STRV_FOREACH(ifname, m->expected_links) { + /* 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; @@ -91,58 +162,31 @@ static bool all_configured(Manager *m) { } } - if (!found) + 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; - - r = sd_network_get_link_state(indices[i], &state); - if (r == -EUNATCH) { - _cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL, *reply = NULL; - unsigned flags; - uint8_t operstate; - - r = sd_rtnl_message_new_link(m->rtnl, &message, RTM_GETLINK, indices[i]); - if (r < 0) { - log_warning("could not create GETLINK message: %s", strerror(-r)); - return false; - } - - r = sd_rtnl_call(m->rtnl, message, 0, &reply); - if (r < 0) { - log_debug("could not get link %u: %s", indices[i], strerror(-r)); - continue; - } - - r = sd_rtnl_message_link_get_flags(reply, &flags); - if (r < 0) { - log_warning("could not get link flags: %s", strerror(-r)); - return false; - } - - r = sd_rtnl_message_read_u8(reply, IFLA_OPERSTATE, &operstate); - if (r < 0) { - log_debug("could not get link operational state: %s", strerror(-r)); - operstate = IF_OPER_UNKNOWN; - } - - if (!(flags & IFF_LOOPBACK) && - link_has_carrier(flags, operstate)) { - /* this link is not managed by us, - but something else may have - made it ready, so don't block */ - one_ready = true; - } + _cleanup_free_ char *state = NULL, *oper_state = NULL; + if (sd_network_link_is_loopback(indices[i])) + /* ignore loopback devices */ continue; - } else if (r < 0 || !streq(state, "configured")) + + 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; - /* we wait for at least one link to appear */ - one_ready = true; + r = sd_network_get_link_operational_state(indices[i], &oper_state); + if (r >= 0 && streq(oper_state, "carrier")) + /* we wait for at least one link to be ready, + regardless of who manages it */ + one_ready = true; } return one_ready; @@ -161,47 +205,12 @@ static int monitor_event_handler(sd_event_source *s, int fd, uint32_t revents, return 1; } -static int newlink_event_handler(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { - Manager *m = userdata; - - assert(m); - assert(m->event); - - if (all_configured(m)) - sd_event_exit(m->event, 0); - - return 1; -} - -static int parse_config_file(Manager *m) { - static const char fn[] = "/etc/systemd/networkd-wait-online.conf"; - _cleanup_fclose_ FILE *f = NULL; - int r; - - f = fopen(fn, "re"); - if (!f) { - if (errno == ENOENT) - return 0; - - log_warning("Failed to open configuration file %s: %m", fn); - return -errno; - } - - r = config_parse(NULL, fn, f, "WaitOnline\0", config_item_perf_lookup, - (void*) wait_online_gperf_lookup, false, false, m); - if (r < 0) - log_warning("Failed to parse configuration file: %s", strerror(-r)); - - return r; -} - void manager_free(Manager *m) { if (!m) return; sd_event_unref(m->event); sd_rtnl_unref(m->rtnl); - strv_free(m->expected_links); free(m); } @@ -212,26 +221,22 @@ int main(int argc, char *argv[]) { _cleanup_network_monitor_unref_ sd_network_monitor *monitor = NULL; int r, fd, events; - log_set_target(LOG_TARGET_AUTO); + umask(0022); + log_parse_environment(); log_open(); - umask(0022); + r = parse_argv(argc, argv); + if (r <= 0) + return r; - if (argc != 1) { - log_error("This program takes no arguments."); - r = -EINVAL; - goto out; - } + if (arg_quiet) + log_set_max_level(LOG_WARNING); m = new0(Manager, 1); if (!m) return log_oom(); - r = parse_config_file(m); - if (r < 0) - goto out; - r = sd_network_monitor_new(NULL, &monitor); if (r < 0) { log_error("Could not create monitor: %s", strerror(-r)); @@ -263,22 +268,12 @@ int main(int argc, char *argv[]) { goto out; } - r = sd_rtnl_open(&m->rtnl, RTMGRP_LINK); + r = sd_rtnl_open(&m->rtnl, 0); if (r < 0) { log_error("Could not create rtnl: %s", strerror(-r)); goto out; } - r = sd_rtnl_attach_event(m->rtnl, m->event, 0); - if (r < 0) { - log_error("Could not attach event to rtnl: %s", strerror(-r)); - return r; - } - - r = sd_rtnl_add_match(m->rtnl, RTM_NEWLINK, newlink_event_handler, m); - if (r < 0) - return r; - if (all_configured(m)) { r = 0; goto out;