shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

Install routes after addresses are ready

Browse Source 
If an IPv6 route is added with a source address that is still
tentative, the kernel will refuse to install it.

Previously, once we sent the messages to the kernel to add the
addresses, we would immediately proceed to add the routes. The
addresses would usually still be tentative at this point, so
adding static IPv6 routes was broken - see issue #5882.

Now, only begin to configure routes once the addresses are ready,
by restructuring the state machine, and tracking when addresses are
ready, not just added.

Fixes: #5882
Signed-off-by: Daniel Axtens <dja@axtens.net>
This commit is contained in:
Daniel Axtens 2018-12-05 21:49:35 +11:00
parent 6accfd3139
commit 6aa5773bff
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/networkd-link.c
View File

@ -861,6 +861,15 @@ void link_check_ready(Link *link) {
if (!link->neighbors_configured)
return;
SET_FOREACH(a, link->addresses, i)
if (!address_is_ready(a))
return;
if (!link->addresses_ready) {
link->addresses_ready = true;
link_request_set_routes(link);
}
if (!link->static_routes_configured)
return;
@ -890,10 +899,6 @@ void link_check_ready(Link *link) {
return;
}
SET_FOREACH(a, link->addresses, i)
if (!address_is_ready(a))
return;
if (link->state != LINK_STATE_CONFIGURED)
link_enter_configured(link);
@ -954,7 +959,7 @@ static int address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link)
if (link->address_messages == 0) {
log_link_debug(link, "Addresses set");
link->addresses_configured = true;
link_request_set_routes(link);
link_check_ready(link);
}
return 1;
@ -1084,6 +1089,7 @@ static int link_request_set_addresses(Link *link) {
/* Reset all *_configured flags we are configuring. */
link->addresses_configured = false;
link->addresses_ready = false;
link->neighbors_configured = false;
link->static_routes_configured = false;
link->routing_policy_rules_configured = false;
@ -1238,7 +1244,7 @@ static int link_request_set_addresses(Link *link) {
if (link->address_messages == 0) {
link->addresses_configured = true;
link_request_set_routes(link);
link_check_ready(link);
} else
log_link_debug(link, "Setting addresses");

1
src/network/networkd-link.h
View File

@ -82,6 +82,7 @@ typedef struct Link {
Set *routes_foreign;
bool addresses_configured;
bool addresses_ready;
sd_dhcp_client *dhcp_client;
sd_dhcp_lease *dhcp_lease;