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

core: log when dynamic IP configuration is restarted and why

Browse source 
(cherry picked from commit 6cd69fde33)
(cherry picked from commit 2f8e4e2b06)
(cherry picked from commit 8011d0b32b)
(cherry picked from commit 3d02df8061)
(cherry picked from commit 2c358b89a2)
This commit is contained in:
Beniamino Galvani 2022-08-24 16:50:14 +02:00
parent 966d45bc7d
commit eb0803de60
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/devices/nm-device-ethernet.c
View file

@ -447,7 +447,7 @@ supplicant_auth_state_changed(NMSupplicantInterface *iface,
if (state == NM_SUPPLICANT_AUTH_STATE_SUCCESS) {
nm_clear_g_signal_handler(priv->supplicant.iface, &priv->supplicant.iface_state_id);
nm_device_update_dynamic_ip_setup(NM_DEVICE(self));
nm_device_update_dynamic_ip_setup(NM_DEVICE(self), "supplicant auth state changed");
}
}

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

@ -4934,7 +4934,7 @@ set_unmanaged_external_down(NMDevice *self, gboolean only_if_unmanaged)
}
void
nm_device_update_dynamic_ip_setup(NMDevice *self)
nm_device_update_dynamic_ip_setup(NMDevice *self, const char *reason)
{
NMDevicePrivate *priv;
@ -4945,6 +4945,8 @@ nm_device_update_dynamic_ip_setup(NMDevice *self)
if (priv->state < NM_DEVICE_STATE_IP_CONFIG || priv->state > NM_DEVICE_STATE_ACTIVATED)
return;
_LOGD(LOGD_DEVICE, "restarting dynamic IP configuration (%s)", reason);
g_hash_table_remove_all(priv->ip6_saved_properties);
if (priv->dhcp_data_4.client) {
@ -4998,7 +5000,7 @@ carrier_changed(NMDevice *self, gboolean carrier)
/* Force master to retry getting ip addresses when carrier
* is restored. */
if (priv->state == NM_DEVICE_STATE_ACTIVATED)
nm_device_update_dynamic_ip_setup(self);
nm_device_update_dynamic_ip_setup(self, "interface got carrier");
/* If needed, also resume IP configuration that is
* waiting for carrier. */
if (nm_device_activate_ip4_state_in_wait(self))
@ -5033,7 +5035,7 @@ carrier_changed(NMDevice *self, gboolean carrier)
* tagged for carrier ignore) ensure that when the carrier appears we
* renew DHCP leases and such.
*/
nm_device_update_dynamic_ip_setup(self);
nm_device_update_dynamic_ip_setup(self, "interface got carrier");
}
} else {
if (priv->state == NM_DEVICE_STATE_UNAVAILABLE) {
@ -5448,7 +5450,7 @@ device_link_changed(NMDevice *self)
/* Update DHCP, etc, if needed */
if (ip_ifname_changed)
nm_device_update_dynamic_ip_setup(self);
nm_device_update_dynamic_ip_setup(self, "IP interface changed");
was_up = priv->up;
priv->up = NM_FLAGS_HAS(pllink->n_ifi_flags, IFF_UP);
@ -5556,7 +5558,7 @@ device_ip_link_changed(NMDevice *self)
priv->ip_iface_ = g_strdup(ip_iface);
_notify(self, PROP_IP_IFACE);
nm_device_update_dynamic_ip_setup(self);
nm_device_update_dynamic_ip_setup(self, "interface renamed");
}
return G_SOURCE_REMOVE;

2
src/core/devices/nm-device.h
View file

@ -768,7 +768,7 @@ void nm_device_reactivate_ip_config(NMDevice * device,
gboolean nm_device_update_hw_address(NMDevice *self);
void nm_device_update_initial_hw_address(NMDevice *self);
void nm_device_update_permanent_hw_address(NMDevice *self, gboolean force_freeze);
void nm_device_update_dynamic_ip_setup(NMDevice *self);
void nm_device_update_dynamic_ip_setup(NMDevice *self, const char *reason);
guint nm_device_get_supplicant_timeout(NMDevice *self);
gboolean nm_device_auth_retries_try_next(NMDevice *self);

2
src/core/devices/wifi/nm-device-wifi.c
View file

@ -2610,7 +2610,7 @@ supplicant_iface_notify_current_bss(NMSupplicantInterface *iface,
* Also, some APs (e.g. Cisco) can be configured to drop
* all traffic until DHCP completes. To support such
* cases, renew the lease when roaming to a new AP. */
nm_device_update_dynamic_ip_setup(NM_DEVICE(self));
nm_device_update_dynamic_ip_setup(NM_DEVICE(self), "roamed to a different AP");
}
set_current_ap(self, new_ap, TRUE);

2
src/core/nm-manager.c
View file

@ -6329,7 +6329,7 @@ do_sleep_wake(NMManager *self, gboolean sleeping_changed)
&& !nm_device_get_unmanaged_flags(device, NM_UNMANAGED_SLEEPING)) {
/* DHCP leases of software devices could have gone stale
* so we need to renew them. */
nm_device_update_dynamic_ip_setup(device);
nm_device_update_dynamic_ip_setup(device, "wake up");
continue;
}