colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: synchronize IPv6 configuration in stage3

Browse Source 
Most of the IPv6 methods require a non-tentative link local address
configured on the interface; we look at priv->ip6_config to determine
if such address exist. If the configuration is out-of-sync, we may
proceed with configuration when the link-local address does not exist
or is still tentative, especially because we toggle the "disable_ipv6"
sysctl parameter just before, which clears all IPv6 addresses on the
interface.

Ensure that priv->ip6_config is up-to-date before continuing with the
IPv6 configuration.

Fixes test: @ipv6_set_ra_announced_mtu
This commit is contained in:
Beniamino Galvani
2017-05-05 16:46:53 +02:00
parent ad35fbf3a3
commit 78b43f7ea1
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/devices/nm-device.c
View File

@@ -531,6 +531,7 @@ static void realize_start_setup (NMDevice *self,
static void _commit_mtu (NMDevice *self, const NMIP4Config *config); static void _commit_mtu (NMDevice *self, const NMIP4Config *config);
static void dhcp_schedule_restart (NMDevice *self, int family, const char *reason); static void dhcp_schedule_restart (NMDevice *self, int family, const char *reason);
static void _cancel_activation (NMDevice *self); static void _cancel_activation (NMDevice *self);
static void update_ip6_config (NMDevice *self, gboolean initial, gboolean check_ll);
/*****************************************************************************/ /*****************************************************************************/
@@ -7718,6 +7719,13 @@ act_stage3_ip6_config_start (NMDevice *self,
/* Re-enable IPv6 on the interface */ /* Re-enable IPv6 on the interface */
set_disable_ipv6 (self, "0"); set_disable_ipv6 (self, "0");
/* Synchronize IPv6 configuration with kernel, since linklocal6_start()
* uses the information there to determine if we can proceed with the
* selected method (SLAAC, DHCP, link-local).
*/
nm_platform_process_events (nm_device_get_platform (self));
update_ip6_config (self, FALSE, FALSE);
ip6_privacy = _ip6_privacy_get (self); ip6_privacy = _ip6_privacy_get (self);
if ( strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) == 0 if ( strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) == 0
@@ -10649,7 +10657,7 @@ _ip6_config_subtract (gpointer value, gpointer user_data)
} }
static void static void
update_ip6_config (NMDevice *self, gboolean initial) update_ip6_config (NMDevice *self, gboolean initial, gboolean check_ll)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
int ifindex; int ifindex;
@@ -10714,7 +10722,8 @@ update_ip6_config (NMDevice *self, gboolean initial)
ip6_config_merge_and_apply (self, FALSE); ip6_config_merge_and_apply (self, FALSE);
} }
if ( priv->linklocal6_timeout_id if ( check_ll
&& priv->linklocal6_timeout_id
&& priv->ext_ip6_config_captured && priv->ext_ip6_config_captured
&& nm_ip6_config_get_address_first_nontentative (priv->ext_ip6_config_captured, TRUE)) { && nm_ip6_config_get_address_first_nontentative (priv->ext_ip6_config_captured, TRUE)) {
/* linklocal6 is ready now, do the state transition... we are also /* linklocal6 is ready now, do the state transition... we are also
@@ -10728,7 +10737,7 @@ void
nm_device_capture_initial_config (NMDevice *self) nm_device_capture_initial_config (NMDevice *self)
{ {
update_ip4_config (self, TRUE); update_ip4_config (self, TRUE);
update_ip6_config (self, TRUE); update_ip6_config (self, TRUE, TRUE);
} }
static gboolean static gboolean
@@ -10774,7 +10783,7 @@ queued_ip6_config_change (gpointer user_data)
return TRUE; return TRUE;
priv->queued_ip6_config_id = 0; priv->queued_ip6_config_id = 0;
update_ip6_config (self, FALSE); update_ip6_config (self, FALSE, TRUE);
if (priv->state < NM_DEVICE_STATE_DEACTIVATING if (priv->state < NM_DEVICE_STATE_DEACTIVATING
&& nm_platform_link_get (nm_device_get_platform (self), priv->ifindex)) { && nm_platform_link_get (nm_device_get_platform (self), priv->ifindex)) {