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

device: wait that IPv6 autoconf addresses become non-tentative

Browse source 
Fixes-test: @ipv6_preserve_cached_routes
This commit is contained in:
Beniamino Galvani 2021-10-27 09:49:28 +02:00
parent 98da62642b
commit 8fb8e334b8
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/core/devices/nm-device.c
View file

@ -627,11 +627,12 @@ typedef struct _NMDevicePrivate {
};
struct {
NMNDisc * ndisc;
GSource * ndisc_grace_source;
gulong ndisc_changed_id;
gulong ndisc_timeout_id;
NMDeviceIPState state;
NMNDisc * ndisc;
GSource * ndisc_grace_source;
gulong ndisc_changed_id;
gulong ndisc_timeout_id;
NMDeviceIPState state;
const NML3ConfigData *l3cd;
} ipac6_data;
union {
@ -823,6 +824,8 @@ _dev_ipac6_grace_period_start(NMDevice *self, guint32 timeout_sec, gboolean forc
static void _dev_ipac6_start(NMDevice *self);
static void _dev_ipac6_set_state(NMDevice *self, NMDeviceIPState state);
static void _dev_unamanged_check_external_down(NMDevice *self, gboolean only_if_unmanaged);
static void _dev_ipshared4_start(NMDevice *self);
@ -3895,6 +3898,20 @@ _dev_l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, N
g_signal_emit(self, signals[PLATFORM_ADDRESS_CHANGED], 0);
}
/* Check if AC6 addresses completed DAD */
if (NM_FLAGS_ANY(notify_data->platform_change_on_idle.obj_type_flags,
nmp_object_type_to_flags(NMP_OBJECT_TYPE_IP6_ADDRESS))
&& priv->ipac6_data.state == NM_DEVICE_IP_STATE_PENDING && priv->ipac6_data.l3cd
&& nm_l3cfg_check_ready(l3cfg,
priv->ipac6_data.l3cd,
AF_INET6,
NM_L3CFG_CHECK_READY_FLAGS_IP6_DAD_READY,
NULL)) {
nm_clear_l3cd(&priv->ipac6_data.l3cd);
_dev_ipac6_set_state(self, NM_DEVICE_IP_STATE_READY);
_dev_ip_state_check_async(self, AF_INET6);
}
_dev_ipmanual_check_ready(self);
update_external_connection(self);
nm_device_queue_recheck_assume(self);
@ -11081,17 +11098,23 @@ _dev_ipac6_ndisc_config_changed(NMNDisc * ndisc,
const NML3ConfigData *l3cd,
NMDevice * self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
_dev_ipac6_grace_period_start(self, 0, TRUE);
_dev_l3_register_l3cds_set_one(self, L3_CONFIG_DATA_TYPE_AC_6, l3cd, FALSE);
_dev_ipac6_set_state(self, NM_DEVICE_IP_STATE_READY);
nm_l3_config_data_unref(priv->ipac6_data.l3cd);
priv->ipac6_data.l3cd = nm_l3_config_data_ref(l3cd);
_dev_ipdhcp6_set_dhcp_level(self, rdata->dhcp_level);
_dev_l3_cfg_commit(self, FALSE);
_dev_ip_state_check_async(self, AF_INET6);
/* wait that addresses are committed to platform and
* become non-tentative before declaring AC6 is ready.*/
}
static void
@ -11307,6 +11330,7 @@ _dev_ipac6_cleanup(NMDevice *self)
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
nm_clear_g_source_inst(&priv->ipac6_data.ndisc_grace_source);
nm_clear_l3cd(&priv->ipac6_data.l3cd);
nm_clear_g_signal_handler(priv->ipac6_data.ndisc, &priv->ipac6_data.ndisc_changed_id);
nm_clear_g_signal_handler(priv->ipac6_data.ndisc, &priv->ipac6_data.ndisc_timeout_id);