SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #27826 from yuwata/network-link-ready-without-ndisc-when-has-static-address

Browse Source 
network: do not request dynamic addressing protocols finished when at…
This commit is contained in:
Yu Watanabe
2023-06-01 06:29:55 +09:00
committed by GitHub
parent 7d52bf16e7 9e7d91ed97
commit 322bda8241
4 changed files with 91 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-address.c
+23
View File
@@ -161,6 +161,29 @@ bool address_is_ready(const Address *a) {
return true;
}
bool link_check_addresses_ready(Link *link, NetworkConfigSource source) {
Address *a;
bool has = false;
assert(link);
/* Check if all addresses on the interface are ready. If there is no address, this will return false. */
SET_FOREACH(a, link->addresses) {
if (source >= 0 && a->source != source)
continue;
if (address_is_marked(a))
continue;
if (!address_exists(a))
continue;
if (!address_is_ready(a))
return false;
has = true;
}
return has;
}
void link_mark_addresses(Link *link, NetworkConfigSource source) {
Address *a;
src/network/networkd-address.h
+1
View File
@@ -81,6 +81,7 @@ int address_remove(Address *address);
int address_remove_and_drop(Address *address);
int address_dup(const Address *src, Address **ret);
bool address_is_ready(const Address *a);
bool link_check_addresses_ready(Link *link, NetworkConfigSource source);
void address_set_broadcast(Address *a, Link *link);
DEFINE_SECTION_CLEANUP_FUNCTIONS(Address, address_free);
src/network/networkd-link.c
+66 -39
View File
@@ -398,11 +398,6 @@ void link_check_ready(Link *link) {
if (!link->static_addresses_configured)
return (void) log_link_debug(link, "%s(): static addresses are not configured.", __func__);
SET_FOREACH(a, link->addresses)
if (!address_is_ready(a))
return (void) log_link_debug(link, "%s(): address %s is not ready.", __func__,
IN_ADDR_PREFIX_TO_STRING(a->family, &a->in_addr, a->prefixlen));
if (!link->static_address_labels_configured)
return (void) log_link_debug(link, "%s(): static address labels are not configured.", __func__);
@@ -436,47 +431,79 @@ void link_check_ready(Link *link) {
!in6_addr_is_set(&link->ipv6ll_address))
return (void) log_link_debug(link, "%s(): IPv6LL is not configured yet.", __func__);
bool has_dynamic_address = false;
/* All static addresses must be ready. */
bool has_static_address = false;
SET_FOREACH(a, link->addresses) {
if (address_is_marked(a))
if (a->source != NETWORK_CONFIG_SOURCE_STATIC)
continue;
if (!address_exists(a))
continue;
if (IN_SET(a->source,
NETWORK_CONFIG_SOURCE_IPV4LL,
NETWORK_CONFIG_SOURCE_DHCP4,
NETWORK_CONFIG_SOURCE_DHCP6,
NETWORK_CONFIG_SOURCE_DHCP_PD,
NETWORK_CONFIG_SOURCE_NDISC)) {
has_dynamic_address = true;
break;
if (!address_is_ready(a))
return (void) log_link_debug(link, "%s(): static address %s is not ready.", __func__,
IN_ADDR_PREFIX_TO_STRING(a->family, &a->in_addr, a->prefixlen));
has_static_address = true;
}
/* If at least one static address is requested, do not request that dynamic addressing protocols are finished. */
if (has_static_address)
goto ready;
/* If no dynamic addressing protocol enabled, assume the interface is ready.
* Note, ignore NDisc when ConfigureWithoutCarrier= is enabled, as IPv6AcceptRA= is enabled by default. */
if (!link_ipv4ll_enabled(link) && !link_dhcp4_enabled(link) &&
!link_dhcp6_enabled(link) && !link_dhcp_pd_is_enabled(link) &&
(link->network->configure_without_carrier || !link_ipv6_accept_ra_enabled(link)))
goto ready;
bool ipv4ll_ready =
link_ipv4ll_enabled(link) && link->ipv4ll_address_configured &&
link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_IPV4LL);
bool dhcp4_ready =
link_dhcp4_enabled(link) && link->dhcp4_configured &&
link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_DHCP4);
bool dhcp6_ready =
link_dhcp6_enabled(link) && link->dhcp6_configured &&
(!link->network->dhcp6_use_address ||
link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_DHCP6));
bool dhcp_pd_ready =
link_dhcp_pd_is_enabled(link) && link->dhcp_pd_configured &&
(!link->network->dhcp_pd_assign ||
link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_DHCP_PD));
bool ndisc_ready =
link_ipv6_accept_ra_enabled(link) && link->ndisc_configured &&
(!link->network->ipv6_accept_ra_use_autonomous_prefix ||
link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_NDISC));
/* If the uplink for PD is self, then request the corresponding DHCP protocol is also ready. */
if (dhcp_pd_is_uplink(link, link, /* accept_auto = */ false)) {
if (link_dhcp4_enabled(link) && link->network->dhcp_use_6rd &&
link->dhcp_lease && dhcp4_lease_has_pd_prefix(link->dhcp_lease)) {
if (!dhcp4_ready)
return (void) log_link_debug(link, "%s(): DHCPv4 6rd prefix is assigned, but DHCPv4 protocol is not finished yet.", __func__);
if (!dhcp_pd_ready)
return (void) log_link_debug(link, "%s(): DHCPv4 is finished, but prefix acquired by DHCPv4-6rd is not assigned yet.", __func__);
}
if (link_dhcp6_enabled(link) && link->network->dhcp6_use_pd_prefix &&
link->dhcp6_lease && dhcp6_lease_has_pd_prefix(link->dhcp6_lease)) {
if (!dhcp6_ready)
return (void) log_link_debug(link, "%s(): DHCPv6 IA_PD prefix is assigned, but DHCPv6 protocol is not finished yet.", __func__);
if (!dhcp_pd_ready)
return (void) log_link_debug(link, "%s(): DHCPv6 is finished, but prefix acquired by DHCPv6 IA_PD is not assigned yet.", __func__);
}
}
if ((link_ipv4ll_enabled(link) || link_dhcp4_enabled(link) || link_dhcp6_with_address_enabled(link) ||
(link_dhcp_pd_is_enabled(link) && link->network->dhcp_pd_assign)) && !has_dynamic_address)
/* When DHCP[46] or IPv4LL is enabled, at least one address is acquired by them. */
return (void) log_link_debug(link, "%s(): DHCPv4, DHCPv6, DHCP-PD or IPv4LL is enabled but no dynamic address is assigned yet.", __func__);
/* At least one dynamic addressing protocol is finished. */
if (!ipv4ll_ready && !dhcp4_ready && !dhcp6_ready && !dhcp_pd_ready && !ndisc_ready)
return (void) log_link_debug(link, "%s(): dynamic addressing protocols are enabled but none of them finished yet.", __func__);
/* Ignore NDisc when ConfigureWithoutCarrier= is enabled, as IPv6AcceptRA= is enabled by default. */
if (link_ipv4ll_enabled(link) || link_dhcp4_enabled(link) ||
link_dhcp6_enabled(link) || link_dhcp_pd_is_enabled(link) ||
(!link->network->configure_without_carrier && link_ipv6_accept_ra_enabled(link))) {
if (!link->ipv4ll_address_configured && !link->dhcp4_configured &&
!link->dhcp6_configured && !link->dhcp_pd_configured && !link->ndisc_configured)
/* When DHCP[46], NDisc, or IPv4LL is enabled, at least one protocol must be finished. */
return (void) log_link_debug(link, "%s(): dynamic addresses or routes are not configured.", __func__);
log_link_debug(link, "%s(): IPv4LL:%s DHCPv4:%s DHCPv6:%s DHCP-PD:%s NDisc:%s",
__func__,
yes_no(link->ipv4ll_address_configured),
yes_no(link->dhcp4_configured),
yes_no(link->dhcp6_configured),
yes_no(link->dhcp_pd_configured),
yes_no(link->ndisc_configured));
}
log_link_debug(link, "%s(): IPv4LL:%s DHCPv4:%s DHCPv6:%s DHCP-PD:%s NDisc:%s",
__func__,
yes_no(ipv4ll_ready),
yes_no(dhcp4_ready),
yes_no(dhcp6_ready),
yes_no(dhcp_pd_ready),
yes_no(ndisc_ready));
ready:
link_set_state(link, LINK_STATE_CONFIGURED);
}
test/test-network/systemd-networkd-tests.py
+1
View File
@@ -4672,6 +4672,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
'--dhcp-alternate-port=67,5555',
ipv4_range='192.168.5.110,192.168.5.119')
self.wait_online(['veth99:routable', 'veth-peer:routable'])
self.wait_address('veth99', r'inet 192.168.5.11[0-9]*/24', ipv='-4')
print('## ip address show dev veth99 scope global')
output = check_output('ip address show dev veth99 scope global')