X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-wait-online.c;h=c6038c63bfaa77d534e86de38a83d3de7ca354ed;hp=900dc05125a800e9be402993205c4034d66f08c8;hb=ac78d81a35fae1c10464992dac25f1527a05cbc9;hpb=020d59000f86b3d98be763eaee6a2671f0427e46
diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index 900dc0512..c6038c63b 100644
--- a/src/network/networkd-wait-online.c
+++ b/src/network/networkd-wait-online.c
@@ -19,14 +19,96 @@
along with systemd; If not, see .
***/
+#include
+#include
+#include
+
#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;
+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;
-static bool all_configured(void) {
+ 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;
+ char **ifname;
bool one_ready = false;
int r, n, i;
@@ -34,97 +116,177 @@ static bool all_configured(void) {
if (n <= 0)
return false;
- for (i = 0; i < n; i++) {
- _cleanup_free_ char *state = NULL;
+ /* 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_network_get_link_state(indices[i], &state);
- if (r < 0)
+ 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;
+ }
- if (streq(state, "configured"))
- one_ready = true;
+ 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 (!streq(state, "configured") && !streq(state, "unmanaged"))
+ if (!found) {
+ /* link exists, but networkd is not yet aware of it */
return false;
+ }
}
- if (one_ready)
- return true;
+ /* 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;
- return false;
+ 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 event_handler(sd_event_source *s, int fd, uint32_t revents,
+static int monitor_event_handler(sd_event_source *s, int fd, uint32_t revents,
void *userdata) {
- sd_event *event = userdata;
+ Manager *m = userdata;
+
+ assert(m);
+ assert(m->event);
- assert(event);
+ if (all_configured(m))
+ sd_event_exit(m->event, 0);
- if (all_configured())
- sd_event_exit(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[]) {
- sd_event *event;
- sd_event_source *event_source;
- sd_network_monitor *monitor;
+ _cleanup_manager_free_ Manager *m = NULL;
+ _cleanup_event_source_unref_ sd_event_source *event_source = 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 (arg_quiet)
+ log_set_max_level(LOG_WARNING);
- if (argc != 1) {
- log_error("This program takes no arguments.");
- r = -EINVAL;
+ m = new0(Manager, 1);
+ if (!m)
+ return log_oom();
+
+ r = sd_event_new(&m->event);
+ if (r < 0) {
+ log_error("Could not create event: %s", strerror(-r));
goto out;
}
- r = sd_network_monitor_new(NULL, &monitor);
+ r = sd_rtnl_open(&m->rtnl, 0);
if (r < 0) {
- log_error("Could not create monitor: %s", strerror(-r));
+ log_error("Could not create rtnl: %s", strerror(-r));
goto out;
}
- r = sd_event_new(&event);
+ r = sd_network_monitor_new(NULL, &m->monitor);
if (r < 0) {
- log_error("Could not create event: %s", strerror(-r));
+ log_error("Could not create monitor: %s", strerror(-r));
goto out;
}
- fd = sd_network_monitor_get_fd(monitor);
+ 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(monitor);
+ 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(event, &event_source, fd, events, &event_handler,
- event);
+ 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()) {
+ if (all_configured(m)) {
r = 0;
goto out;
}
sd_notify(false,
"READY=1\n"
- "STATUS=Waiting for network connecitons...");
+ "STATUS=Waiting for network connections...");
- r = sd_event_loop(event);
+ r = sd_event_loop(m->event);
if (r < 0) {
log_error("Event loop failed: %s", strerror(-r));
goto out;
@@ -134,9 +296,5 @@ out:
sd_notify(false,
"STATUS=All interfaces configured...");
- sd_event_source_unref(event_source);
- sd_event_unref(event);
- sd_network_monitor_unref(monitor);
-
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}