From 8012cd391932d58b44332df106d426a360faf0a6 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 28 Sep 2015 13:38:43 +0200 Subject: networkd: link - only consider configured when all addresses are ready We were considering a link configured whilst its IPv6 addresses were still tentative. Fixes issue #650. --- src/network/networkd-link.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/network/networkd-link.c') diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 9d97089576..9661704f52 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -503,7 +503,10 @@ static int link_enter_configured(Link *link) { return 0; } -void link_client_handler(Link *link) { +void link_check_ready(Link *link) { + Address *a; + Iterator i; + assert(link); assert(link->network); @@ -523,6 +526,10 @@ void link_client_handler(Link *link) { !link->dhcp4_configured && !link->dhcp6_configured)) return; + SET_FOREACH(a, link->addresses, i) + if (!address_is_ready(a)) + return; + if (link->state != LINK_STATE_CONFIGURED) link_enter_configured(link); @@ -550,7 +557,7 @@ static int route_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata if (link->link_messages == 0) { log_link_debug(link, "Routes set"); link->static_configured = true; - link_client_handler(link); + link_check_ready(link); } return 1; @@ -579,7 +586,7 @@ static int link_enter_set_routes(Link *link) { if (link->link_messages == 0) { link->static_configured = true; - link_client_handler(link); + link_check_ready(link); } else log_link_debug(link, "Setting routes"); -- cgit v1.2.3-54-g00ecf