From 9e86dba94b4e6d13f2bd621f2017c5b0628800f7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 12 Dec 2021 02:26:22 +0900 Subject: [PATCH 1/5] network: drop IPv6LL addresses manually configured in .network file --- src/network/networkd-address.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 7cd4d27c07..c4a666a908 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -895,8 +895,11 @@ int link_drop_addresses(Link *link) { if (!address_exists(address)) continue; - /* We consider IPv6LL addresses to be managed by the kernel, or dropped in link_drop_ipv6ll_addresses() */ - if (address->family == AF_INET6 && in6_addr_is_link_local(&address->in_addr.in6)) + /* Do not drop IPv6LL addresses assigned by the kernel here. They will be dropped in + * link_drop_ipv6ll_addresses() if IPv6LL addressing is disabled. */ + if (address->source == NETWORK_CONFIG_SOURCE_FOREIGN && + address->family == AF_INET6 && + in6_addr_is_link_local(&address->in_addr.in6)) continue; k = address_remove(address); From a71c5c44f73553e1af6c10645fa3b5ca0a12f87a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 12 Dec 2021 02:30:27 +0900 Subject: [PATCH 2/5] network: address: minor optimization for link_drop_foreign_addresses() link_address_is_dynamic() is costful in general. Call it only when KeepConfiguration= is set. Note, it is not necessary to check link->network in the loop, as we have the assertion for that in the beginning of the function. --- src/network/networkd-address.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index c4a666a908..603882bd45 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -840,6 +840,10 @@ int link_drop_foreign_addresses(Link *link) { assert(link); assert(link->network); + /* Keep all addresses when KeepConfiguration=yes. */ + if (link->network->keep_configuration == KEEP_CONFIGURATION_YES) + return 0; + /* First, mark all addresses. */ SET_FOREACH(address, link->addresses) { /* We consider IPv6LL addresses to be managed by the kernel, or dropped in link_drop_ipv6ll_addresses() */ @@ -854,10 +858,9 @@ int link_drop_foreign_addresses(Link *link) { if (!address_exists(address)) continue; - if (link_address_is_dynamic(link, address)) { - if (link->network && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP)) - continue; - } else if (link->network && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_STATIC)) + /* link_address_is_dynamic() is slightly heavy. Let's call the function only when KeepConfiguration= is set. */ + if (IN_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP, KEEP_CONFIGURATION_STATIC) && + link_address_is_dynamic(link, address) == (link->network->keep_configuration == KEEP_CONFIGURATION_DHCP)) continue; address_mark(address); From f974f17ae7efe249d84de79d71fc4b7a45f19280 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 12 Dec 2021 02:48:03 +0900 Subject: [PATCH 3/5] networkd: check the existence of the route --- src/network/networkd-address.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 603882bd45..7df743efb5 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -728,6 +728,10 @@ bool link_address_is_dynamic(const Link *link, const Address *address) { if (route->source != NETWORK_CONFIG_SOURCE_FOREIGN) continue; + /* The route is not assigned yet, or already removed. Ignoring. */ + if (!route_exists(route)) + continue; + if (route->protocol != RTPROT_DHCP) continue; From 8a20a8438f57f9301e0c4ddccf2d13cd8fd9a8b2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 12 Dec 2021 02:52:09 +0900 Subject: [PATCH 4/5] network: route: link_drop_foreign_routes() must be called only for managed interfaces --- src/network/networkd-route.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index bfd849abb9..156476066a 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -893,6 +893,7 @@ int link_drop_foreign_routes(Link *link) { assert(link); assert(link->manager); + assert(link->network); SET_FOREACH(route, link->routes) { /* do not touch routes managed by the kernel */ @@ -907,11 +908,11 @@ int link_drop_foreign_routes(Link *link) { if (!route_exists(route)) continue; - if (route->protocol == RTPROT_STATIC && link->network && + if (route->protocol == RTPROT_STATIC && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_STATIC)) continue; - if (route->protocol == RTPROT_DHCP && link->network && + if (route->protocol == RTPROT_DHCP && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP)) continue; From 2347b6b94e13c2a07f33e0c83f2612dfd4ff410f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 16 Dec 2021 23:54:17 +0900 Subject: [PATCH 5/5] test-network: wait for veth99 being configured As the address, which should be kept, may not be just removed yet. Let's check that the address is actually kept. --- test/test-network/systemd-networkd-tests.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 68cdad30ac..a55ac4de7e 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -4588,12 +4588,11 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): print(output) self.assertRegex(output, r'192.168.5.*') - output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env) - print(output) - self.assertRegex(output, r'192.168.5.*') + with open(os.path.join(network_unit_file_path, 'dhcp-client-keep-configuration-dhcp.network'), mode='a') as f: + f.write('[Network]\nDHCP=no\n') - start_networkd(3) - self.wait_online(['veth-peer:routable']) + start_networkd() + self.wait_online(['veth99:routable', 'veth-peer:routable']) print('Still the lease address should be kept after networkd restarted') output = check_output('ip address show dev veth99 scope global')