shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

network: do not remove rule when it is requested by existing links

Browse Source 
Otherwise, the first link once removes all saved rules in the foreign
rule database, and the second or later links create again...
This commit is contained in:
Yu Watanabe 2019-02-22 13:32:47 +09:00
parent 92cd00b974
commit 031fb59a98
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1234,6 +1234,26 @@ int routing_policy_load_rules(const char *state_file, Set **rules) {
return 0;
}
static bool manager_links_have_routing_policy_rule(Manager *m, RoutingPolicyRule *rule) {
RoutingPolicyRule *link_rule;
Iterator i;
Link *link;
assert(m);
assert(rule);
HASHMAP_FOREACH(link, m->links, i) {
if (!link->network)
continue;
LIST_FOREACH(rules, link_rule, link->network->rules)
if (routing_policy_rule_compare_func(link_rule, rule) == 0)
return true;
}
return false;
}
void routing_policy_rule_purge(Manager *m, Link *link) {
RoutingPolicyRule *rule, *existing;
Iterator i;
@ -1247,6 +1267,12 @@ void routing_policy_rule_purge(Manager *m, Link *link) {
if (!existing)
continue; /* Saved rule does not exist anymore. */
if (manager_links_have_routing_policy_rule(m, existing))
continue; /* Existing links have the saved rule. */
/* Existing links do not have the saved rule. Let's drop the rule now, and re-configure it
* later when it is requested. */
r = routing_policy_rule_remove(existing, link, NULL);
if (r < 0) {
log_warning_errno(r, "Could not remove routing policy rules: %m");