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

core: clean up half-done IP operations when re-entering NEED_AUTH state (bgo #741342)

Browse source 
When the device decides it needs re-auth during IP config and returns
to the NEED_AUTH state, make sure we clean up any half-done IP operations
since they will be re-started after auth is completed and the
IP_CONFIG state is re-entered.

https://bugzilla.gnome.org/show_bug.cgi?id=741342
This commit is contained in:
Dan Williams 2014-12-10 10:23:40 -06:00
parent 67bf5cb1a3
commit a1f4794c86
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/devices/nm-device.c
View file

@ -7002,13 +7002,29 @@ nm_device_has_pending_action (NMDevice *self)
/***********************************************************/
static void
_cleanup_generic_pre (NMDevice *self, gboolean deconfigure)
_cleanup_ip_pre (NMDevice *self, gboolean deconfigure)
{
NMConnection *connection;
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
/* Clean up when device was deactivated during call to firewall */
priv->ip4_state = priv->ip6_state = IP_NONE;
nm_device_queued_ip_config_change_clear (self);
dhcp4_cleanup (self, deconfigure, FALSE);
arp_cleanup (self);
dhcp6_cleanup (self, deconfigure, FALSE);
linklocal6_cleanup (self);
addrconf6_cleanup (self);
dnsmasq_cleanup (self);
aipd_cleanup (self);
}
static void
_cleanup_generic_pre (NMDevice *self, gboolean deconfigure)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMConnection *connection;
/* Clean up when device was deactivated during call to firewall */
if (priv->fw_call) {
nm_firewall_manager_cancel_call (nm_firewall_manager_get (), priv->fw_call);
priv->fw_call = NULL;
@ -7031,17 +7047,8 @@ _cleanup_generic_pre (NMDevice *self, gboolean deconfigure)
/* Clear any queued transitions */
nm_device_queued_state_clear (self);
nm_device_queued_ip_config_change_clear (self);
priv->ip4_state = priv->ip6_state = IP_NONE;
dhcp4_cleanup (self, deconfigure, FALSE);
arp_cleanup (self);
dhcp6_cleanup (self, deconfigure, FALSE);
linklocal6_cleanup (self);
addrconf6_cleanup (self);
dnsmasq_cleanup (self);
aipd_cleanup (self);
_cleanup_ip_pre (self, deconfigure);
}
static void
@ -7446,6 +7453,14 @@ _set_state_full (NMDevice *self,
nm_device_cleanup (self, reason);
}
break;
case NM_DEVICE_STATE_NEED_AUTH:
if (old_state > NM_DEVICE_STATE_NEED_AUTH) {
/* Clean up any half-done IP operations if the device's layer2
* finds out it needs authentication during IP config.
*/
_cleanup_ip_pre (self, TRUE);
}
break;
default:
break;
}