picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: Track address configuration 

This will be useful to assert that our static route configuration always
happens after address configuration once our individual configure state
goes away.
This commit is contained in:
William A. Kennington III 2018-11-30 15:54:45 -08:00
parent a01eb97b6c
commit c42ff3a1a7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -741,6 +741,9 @@ void link_check_ready(Link *link) {
if (!link->network)
return;
if (!link->addresses_configured)
return;
if (!link->static_routes_configured)
return;
@ -854,6 +857,8 @@ static int link_enter_set_routes(Link *link) {
assert(link);
assert(link->network);
assert(link->addresses_configured);
assert(link->address_messages == 0);
assert(link->state == LINK_STATE_SETTING_ADDRESSES);
(void) link_set_routing_policy_rule(link);
@ -910,6 +915,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_enter_set_routes(link);
}
@ -1181,9 +1187,10 @@ static int link_enter_set_addresses(Link *link) {
log_link_debug(link, "Offering DHCPv4 leases");
}
if (link->address_messages == 0)
if (link->address_messages == 0) {
link->addresses_configured = true;
link_enter_set_routes(link);
else
} else
log_link_debug(link, "Setting addresses");
return 0;

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

@ -82,6 +82,8 @@ typedef struct Link {
Set *routes;
Set *routes_foreign;
bool addresses_configured;
sd_dhcp_client *dhcp_client;
sd_dhcp_lease *dhcp_lease;
char *lease_file;