From bd7d6cec331a00fed29d00c2498f04e83d70b19c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 10 Jul 2019 00:30:27 +0900 Subject: [PATCH 1/2] network: do not touch kernel-created multicast route Fixes #6088. --- src/network/networkd-link.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 8ca4583034a..17829fca9f9 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2416,6 +2416,15 @@ static int link_drop_foreign_config(Link *link) { if (route->protocol == RTPROT_KERNEL) continue; + /* do not touch multicast route added by kernel */ + /* FIXME: Why the kernel adds this route with protocol RTPROT_BOOT??? We need to investigate that. + * https://tools.ietf.org/html/rfc4862#section-5.4 may explain why. */ + if (route->protocol == RTPROT_BOOT && + route->family == AF_INET6 && + route->dst_prefixlen == 8 && + in_addr_equal(AF_INET6, &route->dst, &(union in_addr_union) { .in6 = {{{ 0xff,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 }}} })) + continue; + if (route->protocol == RTPROT_STATIC && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_STATIC)) continue; From e3cbaeab86532cab4702a6fb67928970a7330b05 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 9 Jul 2019 02:38:14 +0900 Subject: [PATCH 2/2] test-network: add tests for issue #6088 --- test/test-network/systemd-networkd-tests.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index d73895aeab1..458b39de7a9 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -2163,6 +2163,12 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities): print(output) self.assertRegex(output, '192.168.0.16/24') + # for issue #6088 + print('### ip -6 route list table all dev bridge99') + output = check_output('ip -6 route list table all dev bridge99') + print(output) + self.assertRegex(output, 'ff00::/8 table local metric 256 pref medium') + self.assertEqual(call('ip link del test1'), 0) time.sleep(3) @@ -2179,6 +2185,11 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities): self.assertNotRegex(output, '192.168.0.15/24') self.assertNotRegex(output, '192.168.0.16/24') + print('### ip -6 route list table all dev bridge99') + output = check_output('ip -6 route list table all dev bridge99') + print(output) + self.assertRegex(output, 'ff00::/8 table local metric 256 (?:linkdown |)pref medium') + def test_bridge_ignore_carrier_loss(self): copy_unit_to_networkd_unit_path('11-dummy.netdev', '12-dummy.netdev', '26-bridge.netdev', '26-bridge-slave-interface-1.network', '26-bridge-slave-interface-2.network',