shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

Merge pull request #34072 from yuwata/networkd-routing-policy-rule-follow-up

Browse Source 
network/routing-policy-rule: follow up for recent change
This commit is contained in:
Yu Watanabe 2024-08-22 07:17:10 +09:00 committed by GitHub
commit 00ed8c6dfa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,11 +351,13 @@ static bool routing_policy_rule_equal(const RoutingPolicyRule *a, const RoutingP
return routing_policy_rule_compare_func_full(a, b, /* all = */ false) == 0;
}
static bool routing_policy_rule_can_update(const RoutingPolicyRule *existing, const RoutingPolicyRule *requesting, int family) {
static bool routing_policy_rule_can_update(const RoutingPolicyRule *existing, const RoutingPolicyRule *requesting) {
assert(existing);
assert(IN_SET(existing->family, AF_INET, AF_INET6));
assert(requesting);
assert(IN_SET(requesting->family, AF_INET, AF_INET6) || requesting->address_family == ADDRESS_FAMILY_YES);
if (!routing_policy_rule_equal(existing, requesting, family, existing->priority))
if (!routing_policy_rule_equal(existing, requesting, existing->family, existing->priority))
return false;
/* These flags cannot be updated. */
@ -791,7 +793,7 @@ static void manager_unmark_routing_policy_rule(Manager *m, const RoutingPolicyRu
if (routing_policy_rule_get(m, rule, family, &existing) < 0)
return;
if (!routing_policy_rule_can_update(existing, rule, rule->family))
if (!routing_policy_rule_can_update(existing, rule))
return;
routing_policy_rule_unmark(existing);

22
test/test-network/systemd-networkd-tests.py
View File

@ -3211,6 +3211,8 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.assertRegex(output, routable_map[carrier])
def check_routing_policy_rule_test1(self):
print('### Checking routing policy rules requested by test1')
output = check_output('ip rule list iif test1 priority 111')
print(output)
self.assertRegex(output, r'111: from 192.168.100.18 tos (0x08|throughput) iif test1 oif test1 lookup 7')
@ -3236,7 +3238,9 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.assertIn('104: from 10.1.0.0/16 iif test1 lookup 12 nop', output)
def check_routing_policy_rule_dummy98(self):
output = check_output('ip rule list table 8')
print('### Checking routing policy rules requested by dummy98')
output = check_output('ip rule list priority 112')
print(output)
self.assertRegex(output, r'112: from 192.168.101.18 tos (0x08|throughput) iif dummy98 oif dummy98 lookup 8')
@ -3284,10 +3288,12 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
with self.subTest(manage_foreign_routes=manage_foreign_routes):
self._test_routing_policy_rule(manage_foreign_routes)
def test_routing_policy_rule_issue_11280(self):
def test_routing_policy_rule_restart_and_reconfigure(self):
copy_network_unit('25-routing-policy-rule-test1.network', '11-dummy.netdev',
'25-routing-policy-rule-dummy98.network', '12-dummy.netdev')
# For #11280 and #34068.
for trial in range(3):
restart_networkd(show_logs=(trial > 0))
self.wait_online('test1:degraded', 'dummy98:degraded')
@ -3295,6 +3301,18 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.check_routing_policy_rule_test1()
self.check_routing_policy_rule_dummy98()
networkctl_reconfigure('test1')
self.wait_online('test1:degraded')
self.check_routing_policy_rule_test1()
self.check_routing_policy_rule_dummy98()
networkctl_reconfigure('dummy98')
self.wait_online('dummy98:degraded')
self.check_routing_policy_rule_test1()
self.check_routing_policy_rule_dummy98()
def test_routing_policy_rule_reconfigure(self):
copy_network_unit('25-routing-policy-rule-reconfigure2.network', '11-dummy.netdev')
start_networkd()