Skip to content

Commit a9d240f

Browse files
committed
network: do not serialize/deserialize routing policy rules
We already handle foreign routing policy rules correctly by the previous commit. So, the serialization/deserialization of rules are not necessary anymore.
1 parent 0b81225 commit a9d240f

File tree

6 files changed

+0
-476
lines changed

6 files changed

+0
-476
lines changed

src/network/meson.build

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,6 @@ if conf.get('ENABLE_NETWORKD') == 1
273273
[threads],
274274
'', '', [], network_include_dir],
275275

276-
[['src/network/test-routing-policy-rule.c'],
277-
[libnetworkd_core,
278-
libsystemd_network],
279-
[], '', '', [], network_include_dir],
280-
281276
[['src/network/test-network-tables.c',
282277
test_tables_h],
283278
[libnetworkd_core,

src/network/networkd-manager.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -707,10 +707,6 @@ static int manager_save(Manager *m) {
707707
ordered_set_print(f, "DOMAINS=", search_domains);
708708
ordered_set_print(f, "ROUTE_DOMAINS=", route_domains);
709709

710-
r = routing_policy_serialize_rules(m->rules, f);
711-
if (r < 0)
712-
goto fail;
713-
714710
r = fflush_and_check(f);
715711
if (r < 0)
716712
goto fail;
@@ -851,8 +847,6 @@ int manager_new(Manager **ret) {
851847

852848
m->duid.type = DUID_TYPE_EN;
853849

854-
(void) routing_policy_load_rules(m->state_file, &m->rules_saved);
855-
856850
*ret = TAKE_PTR(m);
857851

858852
return 0;
@@ -887,7 +881,6 @@ void manager_free(Manager *m) {
887881
* So, it is necessary to set NULL after the sets are freed. */
888882
m->rules = set_free(m->rules);
889883
m->rules_foreign = set_free(m->rules_foreign);
890-
set_free(m->rules_saved);
891884

892885
sd_netlink_unref(m->rtnl);
893886
sd_netlink_unref(m->genl);

src/network/networkd-manager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ struct Manager {
6060

6161
Set *rules;
6262
Set *rules_foreign;
63-
Set *rules_saved;
6463

6564
/* Manager stores routes without RTA_OIF attribute. */
6665
Set *routes;

0 commit comments

Comments
 (0)