fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 03:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: never stop trying renewing the lease

Browse source 
Always reschedule a lease renewal attempt: just clear the scheduled
renewal if the connection is really deactivated.
This commit is contained in:
Francesco Giudici 2018-01-15 12:17:54 +01:00
parent da0fee4d9f
commit 1a20ff86d5
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6260,15 +6260,23 @@ dhcp4_fail (NMDevice *self, gboolean timeout)
&& (timeout || (priv->ip4_state == IP_CONF))
&& !priv->dhcp4.was_active)
nm_device_activate_schedule_ip4_config_timeout (self);
else if (priv->ip4_state == IP_DONE || priv->dhcp4.was_active) {
else if ( priv->dhcp4.num_tries_left < DHCP_NUM_TRIES_MAX
|| priv->ip4_state == IP_DONE
|| priv->dhcp4.was_active) {
/* Don't fail immediately when the lease expires but try to
* restart DHCP for a predefined number of times.
*/
if (priv->dhcp4.num_tries_left) {
priv->dhcp4.num_tries_left--;
dhcp_schedule_restart (self, AF_INET, "lease expired");
} else
} else {
nm_device_ip_method_failed (self, AF_INET, NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED);
/* We failed the ipv4 method but schedule again the retries if the ipv6 method is
* configured, keeping the connection up.
*/
if (nm_device_get_state (self) != NM_DEVICE_STATE_FAILED)
dhcp_schedule_restart (self, AF_INET, "renewal failed");
}
} else
g_warn_if_reached ();
}
@ -6310,6 +6318,12 @@ dhcp4_state_changed (NMDhcpClient *client,
break;
}
/* After some failures, we have been able to renew the lease:
* update the ip state
*/
if (priv->ip4_state == IP_FAIL)
_set_ip_state (self, AF_INET, IP_CONF);
g_free (priv->dhcp4.pac_url);
priv->dhcp4.pac_url = g_strdup (g_hash_table_lookup (options, "wpad"));
nm_device_set_proxy_config (self, priv->dhcp4.pac_url);
@ -7087,15 +7101,23 @@ dhcp6_fail (NMDevice *self, gboolean timeout)
&& (timeout || (priv->ip6_state == IP_CONF))
&& !priv->dhcp6.was_active)
nm_device_activate_schedule_ip6_config_timeout (self);
else if (priv->ip6_state == IP_DONE || priv->dhcp6.was_active) {
else if ( priv->dhcp6.num_tries_left < DHCP_NUM_TRIES_MAX
|| priv->ip6_state == IP_DONE
|| priv->dhcp6.was_active) {
/* Don't fail immediately when the lease expires but try to
* restart DHCP for a predefined number of times.
*/
if (priv->dhcp6.num_tries_left) {
priv->dhcp6.num_tries_left--;
dhcp_schedule_restart (self, AF_INET6, "lease expired");
} else
} else {
nm_device_ip_method_failed (self, AF_INET6, NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED);
/* We failed the ipv6 method but schedule again the retries if the ipv4 method is
* configured, keeping the connection up.
*/
if (nm_device_get_state (self) != NM_DEVICE_STATE_FAILED)
dhcp_schedule_restart (self, AF_INET6, "renewal failed");
}
} else
g_warn_if_reached ();
} else {
@ -7162,6 +7184,12 @@ dhcp6_state_changed (NMDhcpClient *client,
applied_config_clear (&priv->dhcp6.ip6_config);
}
/* After long time we have been able to renew the lease:
* update the ip state
*/
if (priv->ip6_state == IP_FAIL)
_set_ip_state (self, AF_INET6, IP_CONF);
priv->dhcp6.num_tries_left = DHCP_NUM_TRIES_MAX;
if (priv->ip6_state == IP_CONF) {