Skip to content

Commit eb72fa3

Browse files
yuwatayuwata
committed
network: use NetworkConfigSource/State to manage routing policy rules
This also changes the logic when Priority= is not specified. Previously, we request without FRA_PRIORITY attribute and kernel picks the highest unused priority for the rule. This makes networkd picks the highest unused priority and always request FRA_PRIORITY attribute.
1 parent 193c4af commit eb72fa3

File tree

4 files changed

+198
-247
lines changed

4 files changed

+198
-247
lines changed

‎src/network/networkd-manager.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,7 @@ Manager* manager_free(Manager *m) {
473473
hashmap_free(m->route_table_names_by_number);
474474
hashmap_free(m->route_table_numbers_by_name);
475475

476-
/* routing_policy_rule_free() access m->rules and m->rules_foreign.
477-
* So, it is necessary to set NULL after the sets are freed. */
478-
m->rules = set_free(m->rules);
479-
m->rules_foreign = set_free(m->rules_foreign);
476+
set_free(m->rules);
480477

481478
sd_netlink_unref(m->rtnl);
482479
sd_netlink_unref(m->genl);

‎src/network/networkd-manager.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ struct Manager {
6464
char* dynamic_hostname;
6565
char* dynamic_timezone;
6666

67-
unsigned routing_policy_rule_remove_messages;
6867
Set *rules;
69-
Set *rules_foreign;
7068

7169
/* Manage nexthops by id. */
7270
Hashmap *nexthops_by_id;

0 commit comments

Comments
 (0)