summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-05-07 16:35:52 +0200
committerTom Gundersen <teg@jklm.no>2014-05-07 16:54:02 +0200
commitbc6345767e9f6864f1e1c0e87fe5da352c00e67f (patch)
treea58d5bd11fc82f5e1e687e08dddea52faca1139e /src
parent99b4cc3e75e757c07d573e2f4c29f47393e24fa1 (diff)
networkd-wait-online: rely purely on sd-network events and drop rtnl hooks
Diffstat (limited to 'src')
-rw-r--r--src/network/networkd-wait-online.c65
1 files changed, 11 insertions, 54 deletions
diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index ba02586dcd..a4729f464f 100644
--- a/src/network/networkd-wait-online.c
+++ b/src/network/networkd-wait-online.c
@@ -116,6 +116,7 @@ static bool all_configured(Manager *m) {
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;
@@ -167,11 +168,14 @@ static bool all_configured(Manager *m) {
}
}
+ /* 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;
- _cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL, *reply = NULL;
- unsigned flags;
- uint8_t operstate;
+ _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 != -EUNATCH && (r < 0 || !streq(state, "configured"))) {
@@ -179,36 +183,11 @@ static bool all_configured(Manager *m) {
return false;
}
- 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)) {
+ 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;
@@ -227,18 +206,6 @@ 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;
-}
-
void manager_free(Manager *m) {
if (!m)
return;
@@ -302,22 +269,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;