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

dhcp: set @was_active flag for external activations

Browse source 
Set the @was_active flag for external activations with DHCP, so that
DHCP is retried multiple times in case of failure, as we do for
managed connections when the lease expires and for assumed
connections.

Fixes test: renewal_gw_after_dhcp_outage_for_assumed_var1
Fixes: e3113fdc4b

(cherry picked from commit ddfeed4530)
This commit is contained in:
Beniamino Galvani 2017-05-08 08:44:51 +02:00
parent e6ff7f211d
commit 179ad1ee2e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5844,7 +5844,7 @@ dhcp4_start (NMDevice *self,
nm_device_add_pending_action (self, NM_PENDING_ACTION_DHCP4, TRUE);
if (nm_device_sys_iface_state_get (self) == NM_DEVICE_SYS_IFACE_STATE_ASSUME)
if (nm_device_sys_iface_state_is_external_or_assume (self))
priv->dhcp4.was_active = TRUE;
/* DHCP devices will be notified by the DHCP manager when stuff happens */
@ -6645,8 +6645,8 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection)
self);
}
if (nm_device_sys_iface_state_get (self) == NM_DEVICE_SYS_IFACE_STATE_ASSUME)
priv->dhcp6.was_active = TRUE;
if (nm_device_sys_iface_state_is_external_or_assume (self))
priv->dhcp4.was_active = TRUE;
return !!priv->dhcp6.client;
}