shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-14 04:58:28 +03:00
Code

network: do not configure static configs more than once simultaneously

Browse Source
This commit is contained in:
Yu Watanabe 2020-12-11 14:39:46 +09:00
parent b788a429d1
commit bd4733da64
8 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/networkd-address.c
View File

@ -1004,6 +1004,11 @@ int link_set_addresses(Link *link) {
return 0;
}
if (link->address_messages != 0) {
log_link_debug(link, "Static addresses are configuring.");
return 0;
}
ORDERED_HASHMAP_FOREACH(ad, link->network->addresses_by_section) {
bool update;

5
src/network/networkd-mdb.c
View File

@ -199,6 +199,11 @@ int link_set_bridge_mdb(Link *link) {
assert(link);
assert(link->manager);
if (link->bridge_mdb_messages != 0) {
log_link_debug(link, "MDB entries are configuring.");
return 0;
}
link->bridge_mdb_configured = false;
if (!link->network)

5
src/network/networkd-neighbor.c
View File

@ -294,6 +294,11 @@ int link_set_neighbors(Link *link) {
assert(link->network);
assert(link->state != _LINK_STATE_INVALID);
if (link->neighbor_messages != 0) {
log_link_debug(link, "Neighbors are configuring.");
return 0;
}
link->neighbors_configured = false;
HASHMAP_FOREACH(neighbor, link->network->neighbors_by_section) {

5
src/network/networkd-nexthop.c
View File

@ -312,6 +312,11 @@ int link_set_nexthop(Link *link) {
assert(link);
assert(link->network);
if (link->nexthop_messages != 0) {
log_link_debug(link, "Nexthops are configuring.");
return 0;
}
link->static_nexthops_configured = false;
HASHMAP_FOREACH(nh, link->network->nexthops_by_section) {

5
src/network/networkd-route.c
View File

@ -1237,6 +1237,11 @@ int link_set_routes(Link *link) {
* the addresses now, let's not configure the routes either. */
return 0;
if (link->route_messages != 0) {
log_link_debug(link, "Static routes are configuring.");
return 0;
}
r = link_set_routing_policy_rules(link);
if (r < 0)
return r;

5
src/network/networkd-routing-policy-rule.c
View File

@ -663,6 +663,11 @@ int link_set_routing_policy_rules(Link *link) {
assert(link);
assert(link->network);
if (link->routing_policy_rule_messages != 0) {
log_link_debug(link, "Routing policy rules are configuring.");
return 0;
}
link->routing_policy_rules_configured = false;
HASHMAP_FOREACH(rule, link->network->rules_by_section) {

9
src/network/networkd-sriov.c
View File

@ -230,8 +230,15 @@ int link_configure_sr_iov(Link *link) {
SRIOV *sr_iov;
int r;
assert(link);
assert(link->network);
if (link->sr_iov_messages != 0) {
log_link_debug(link, "SR-IOV is configuring.");
return 0;
}
link->sr_iov_configured = false;
link->sr_iov_messages = 0;
ORDERED_HASHMAP_FOREACH(sr_iov, link->network->sr_iov_by_section) {
r = sr_iov_configure(link, sr_iov);

9
src/network/tc/tc.c
View File

@ -39,8 +39,15 @@ int link_configure_traffic_control(Link *link) {
TrafficControl *tc;
int r;
assert(link);
assert(link->network);
if (link->tc_messages != 0) {
log_link_debug(link, "Traffic control is configuring.");
return 0;
}
link->tc_configured = false;
link->tc_messages = 0;
ORDERED_HASHMAP_FOREACH(tc, link->network->tc_by_section) {
r = traffic_control_configure(link, tc);