fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 17:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: improve detection of DADFAILED addresses

Browse source 
Instead of assuming any address that disappeared was because of a DAD
failure, check explicitly that either:

 - the address is still present with DADFAILED flag (in case it was a
   permanent address), or

 - the address was removed and platform recorded that it had the
   DADFAILED flag.
This commit is contained in:
Beniamino Galvani 2022-09-22 14:02:23 +02:00
parent 922ef4344e
commit 8e85c86add
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/core/dhcp/nm-dhcp-client.c
View file

@ -1039,35 +1039,33 @@ ipv6_lladdr_find(NMDhcpClient *self)
static void static void
ipv6_tentative_addr_check(NMDhcpClient *self, ipv6_tentative_addr_check(NMDhcpClient *self,
GPtrArray **tentative, GPtrArray **tentative,
GPtrArray **missing, GPtrArray **dadfailed,
const NMPlatformIP6Address **valid) const NMPlatformIP6Address **valid)
{ {
NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self);
NMDedupMultiIter iter; NMDedupMultiIter iter;
const NMPlatformIP6Address *addr; const NMPlatformIP6Address *addr;
NML3Cfg *l3cfg = priv->config.l3cfg; NML3Cfg *l3cfg = priv->config.l3cfg;
NMPlatform *platform = nm_l3cfg_get_platform(l3cfg);
int ifindex = nm_l3cfg_get_ifindex(l3cfg);
/* For each address in the lease, check whether it's tentative /* For each address in the lease, check whether it's tentative
* in platform. */ * or dad-failed in platform. */
nm_l3_config_data_iter_ip6_address_for_each (&iter, priv->l3cd_curr, &addr) { nm_l3_config_data_iter_ip6_address_for_each (&iter, priv->l3cd_curr, &addr) {
const NMPlatformIP6Address *pladdr; const NMPlatformIP6Address *pladdr;
NMPObject needle;
nmp_object_stackinit_id_ip6_address(&needle, nm_l3cfg_get_ifindex(l3cfg), &addr->address); pladdr = nm_platform_ip6_address_get(platform, ifindex, &addr->address);
pladdr = NMP_OBJECT_CAST_IP6_ADDRESS(nm_platform_lookup_obj(nm_l3cfg_get_platform(l3cfg), if ((pladdr && NM_FLAGS_HAS(pladdr->n_ifa_flags, IFA_F_DADFAILED))
NMP_CACHE_ID_TYPE_OBJECT_TYPE, || (!pladdr && nm_platform_ip6_dadfailed_check(platform, ifindex, &addr->address))) {
&needle)); if (dadfailed) {
if (!pladdr) { if (!*dadfailed)
/* address removed: we assume that's because DAD failed */ *dadfailed = g_ptr_array_new();
if (missing) { g_ptr_array_add(*dadfailed, (gpointer) addr);
if (!*missing)
*missing = g_ptr_array_new();
g_ptr_array_add(*missing, (gpointer) addr);
} }
continue; continue;
} }
if (NM_FLAGS_HAS(pladdr->n_ifa_flags, IFA_F_TENTATIVE) if (pladdr && NM_FLAGS_HAS(pladdr->n_ifa_flags, IFA_F_TENTATIVE)
&& !NM_FLAGS_HAS(pladdr->n_ifa_flags, IFA_F_OPTIMISTIC)) { && !NM_FLAGS_HAS(pladdr->n_ifa_flags, IFA_F_OPTIMISTIC)) {
if (tentative) { if (tentative) {
if (!*tentative) if (!*tentative)
@ -1076,6 +1074,9 @@ ipv6_tentative_addr_check(NMDhcpClient *self,
} }
} }
/* Here the address is non-tentative or it was removed externally by the user.
* In both cases it has completed DAD.
*/
NM_SET_OUT(valid, addr); NM_SET_OUT(valid, addr);
} }
} }
@ -1115,13 +1116,13 @@ l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcp
if (notify_data->notify_type == NM_L3_CONFIG_NOTIFY_TYPE_PLATFORM_CHANGE_ON_IDLE if (notify_data->notify_type == NM_L3_CONFIG_NOTIFY_TYPE_PLATFORM_CHANGE_ON_IDLE
&& priv->l3cfg_notify.wait_ipv6_dad) { && priv->l3cfg_notify.wait_ipv6_dad) {
gs_unref_ptrarray GPtrArray *tentative = NULL; gs_unref_ptrarray GPtrArray *tentative = NULL;
gs_unref_ptrarray GPtrArray *missing = NULL; gs_unref_ptrarray GPtrArray *dadfailed = NULL;
const NMPlatformIP6Address *valid = NULL; const NMPlatformIP6Address *valid = NULL;
char str[NM_UTILS_TO_STRING_BUFFER_SIZE]; char str[NM_UTILS_TO_STRING_BUFFER_SIZE];
guint i; guint i;
gs_free_error GError *error = NULL; gs_free_error GError *error = NULL;
ipv6_tentative_addr_check(self, &tentative, &missing, &valid); ipv6_tentative_addr_check(self, &tentative, &dadfailed, &valid);
if (tentative) { if (tentative) {
for (i = 0; i < tentative->len; i++) { for (i = 0; i < tentative->len; i++) {
_LOGD("still waiting DAD for address: %s", _LOGD("still waiting DAD for address: %s",
@ -1134,10 +1135,10 @@ l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcp
nm_clear_g_source_inst(&priv->v6.dad_timeout_source); nm_clear_g_source_inst(&priv->v6.dad_timeout_source);
l3_cfg_notify_check_connected(self); l3_cfg_notify_check_connected(self);
if (missing) { if (dadfailed) {
for (i = 0; i < missing->len; i++) { for (i = 0; i < dadfailed->len; i++) {
_LOGE("DAD failed for address: %s", _LOGE("DAD failed for address: %s",
nm_platform_ip6_address_to_string(missing->pdata[i], str, sizeof(str))); nm_platform_ip6_address_to_string(dadfailed->pdata[i], str, sizeof(str)));
} }
} }