device: log more details when setting MAC address

6 files changed, 26 insertions, 24 deletions

diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index db2eb4f5f3..6cf544a3e5 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -1353,7 +1353,7 @@ deactivate (NMDevice *device)
 	if (nm_device_get_applied_setting (device, NM_TYPE_SETTING_PPPOE))
 		NM_DEVICE_ETHERNET_GET_PRIVATE (device)->last_pppoe_time = nm_utils_get_monotonic_timestamp_s ();
 
-	nm_device_hw_addr_reset (device);
+	nm_device_hw_addr_reset (device, "deactivate");
 }
 
 static gboolean
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index 583f260e8d..390c2a3975 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/devices/nm-device-macvlan.c
@@ -544,7 +544,7 @@ realize_start_notify (NMDevice *device, const NMPlatformLink *plink)
 static void
 deactivate (NMDevice *device)
 {
-	nm_device_hw_addr_reset (device);
+	nm_device_hw_addr_reset (device, "deactivate");
 }
 
 /******************************************************************/
diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h
index b641751205..7381fd930f 100644
--- a/src/devices/nm-device-private.h
+++ b/src/devices/nm-device-private.h
@@ -56,9 +56,9 @@ gboolean nm_device_bring_up (NMDevice *self, gboolean wait, gboolean *no_firmwar
 
 void nm_device_take_down (NMDevice *self, gboolean block);
 
-gboolean nm_device_hw_addr_set (NMDevice *device, const char *addr);
+gboolean nm_device_hw_addr_set (NMDevice *device, const char *addr, const char *detail);
 gboolean nm_device_hw_addr_set_cloned (NMDevice *device, NMConnection *connection, gboolean is_wifi);
-gboolean nm_device_hw_addr_reset (NMDevice *device);
+gboolean nm_device_hw_addr_reset (NMDevice *device, const char *detail);
 
 void nm_device_set_firmware_missing (NMDevice *self, gboolean missing);
 
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index c710917419..f4513d530c 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -110,7 +110,7 @@ parent_hwaddr_maybe_changed (NMDevice *parent,
 	_LOGD (LOGD_VLAN, "parent hardware address changed to %s%s%s",
 	       NM_PRINT_FMT_QUOTE_STRING (new_mac));
 	if (new_mac) {
-		nm_device_hw_addr_set (self, new_mac);
+		nm_device_hw_addr_set (self, new_mac, "vlan-parent");
 		/* When changing the hw address the interface is taken down,
 		 * removing the IPv6 configuration; reapply it.
 		 */
@@ -616,7 +616,7 @@ ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
 static void
 deactivate (NMDevice *device)
 {
-	nm_device_hw_addr_reset (device);
+	nm_device_hw_addr_reset (device, "deactivate");
 }
 
 /******************************************************************/
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 279d7e327b..d1b0e56357 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -11048,7 +11048,7 @@ _set_state_full (NMDevice *self,
 				if (nm_device_get_act_request (self))
 					nm_device_cleanup (self, reason, CLEANUP_TYPE_DECONFIGURE);
 				nm_device_take_down (self, TRUE);
-				nm_device_hw_addr_reset (self);
+				nm_device_hw_addr_reset (self, "unmanage");
 				set_nm_ipv6ll (self, FALSE);
 				restore_ip6_properties (self);
 			}
@@ -11603,6 +11603,7 @@ nm_device_hw_addr_is_explict (NMDevice *self)
 static gboolean
 _hw_addr_set (NMDevice *self,
               const char *addr,
+              const char *operation,
               const char *detail)
 {
 	NMDevicePrivate *priv;
@@ -11614,7 +11615,7 @@ _hw_addr_set (NMDevice *self,
 
 	nm_assert (NM_IS_DEVICE (self));
 	nm_assert (addr);
-	nm_assert (detail);
+	nm_assert (operation);
 
 	priv = NM_DEVICE_GET_PRIVATE (self);
 
@@ -11633,7 +11634,7 @@ _hw_addr_set (NMDevice *self,
 	    || !nm_utils_hwaddr_aton (addr, addr_bytes, hw_addr_len))
 		g_return_val_if_reached (FALSE);
 
-	_LOGT (LOGD_DEVICE, "set-hw-addr: setting MAC address to '%s'...", addr);
+	_LOGT (LOGD_DEVICE, "set-hw-addr: setting MAC address to '%s' (%s, %s)...", addr, operation, detail);
 
 	was_up = nm_device_is_up (self);
 	if (was_up) {
@@ -11647,16 +11648,17 @@ _hw_addr_set (NMDevice *self,
 		nm_device_update_hw_address (self);
 		cur_addr = nm_device_get_hw_address (self);
 		if (cur_addr && nm_utils_hwaddr_matches (cur_addr, -1, addr, -1)) {
-			_LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s",
-			       detail, addr);
+			_LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
+			       operation, addr, detail);
 		} else {
 			_LOGW (LOGD_DEVICE,
-			       "set-hw-addr: new MAC address %s not successfully set", addr);
+			       "set-hw-addr: new MAC address %s not successfully set to %s (%s)",
+			       addr, operation, detail);
 			success = FALSE;
 		}
 	} else {
-		_LOGW (LOGD_DEVICE, "set-hw-addr: failed to %s MAC address to %s",
-		       detail, addr);
+		_LOGW (LOGD_DEVICE, "set-hw-addr: failed to %s MAC address to %s (%s)",
+		       operation, addr, detail);
 	}
 
 	if (was_up) {
@@ -11668,7 +11670,7 @@ _hw_addr_set (NMDevice *self,
 }
 
 gboolean
-nm_device_hw_addr_set (NMDevice *self, const char *addr)
+nm_device_hw_addr_set (NMDevice *self, const char *addr, const char *detail)
 {
 	NMDevicePrivate *priv;
 
@@ -11684,7 +11686,7 @@ nm_device_hw_addr_set (NMDevice *self, const char *addr)
 	 * In this case, it's like setting it to PERMANENT. */
 	priv->hw_addr_type = HW_ADDR_TYPE_PERMANENT;
 
-	return _hw_addr_set (self, addr, "set");
+	return _hw_addr_set (self, addr, "set", detail);
 }
 
 gboolean
@@ -11693,7 +11695,7 @@ nm_device_hw_addr_set_cloned (NMDevice *self, NMConnection *connection, gboolean
 	NMDevicePrivate *priv;
 	gs_free char *hw_addr_tmp = NULL;
 	gs_free char *hw_addr_generated = NULL;
-	const char *addr;
+	const char *addr, *addr_setting;
 
 	g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
 
@@ -11702,11 +11704,11 @@ nm_device_hw_addr_set_cloned (NMDevice *self, NMConnection *connection, gboolean
 	if (!connection)
 		g_return_val_if_reached (FALSE);
 
-	addr = _get_cloned_mac_address_setting (self, connection, is_wifi, &hw_addr_tmp);
+	addr = addr_setting = _get_cloned_mac_address_setting (self, connection, is_wifi, &hw_addr_tmp);
 
 	if (nm_streq (addr, NM_CLONED_MAC_PRESERVE)) {
 		/* "preserve" means to reset the initial MAC address. */
-		return nm_device_hw_addr_reset (self);
+		return nm_device_hw_addr_reset (self, addr_setting);
 	}
 
 	if (nm_streq (addr, NM_CLONED_MAC_PERMANENT)) {
@@ -11745,11 +11747,11 @@ nm_device_hw_addr_set_cloned (NMDevice *self, NMConnection *connection, gboolean
 		priv->hw_addr_type = HW_ADDR_TYPE_EXPLICIT;
 	}
 
-	return _hw_addr_set (self, addr, "set-cloned");
+	return _hw_addr_set (self, addr, "set-cloned", addr_setting);
 }
 
 gboolean
-nm_device_hw_addr_reset (NMDevice *self)
+nm_device_hw_addr_reset (NMDevice *self, const char *detail)
 {
 	NMDevicePrivate *priv;
 	const char *addr;
@@ -11769,7 +11771,7 @@ nm_device_hw_addr_reset (NMDevice *self)
 		g_return_val_if_reached (FALSE);
 	}
 
-	return _hw_addr_set (self, addr, "reset");
+	return _hw_addr_set (self, addr, "reset", detail);
 }
 
 const char *
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index ebbd34fb49..3db69cd890 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -1056,7 +1056,7 @@ _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset)
 	if (!randomize) {
 		g_clear_pointer (&priv->hw_addr_scan, g_free);
 		if (do_reset)
-			nm_device_hw_addr_reset (device);
+			nm_device_hw_addr_reset (device, "scanning");
 		return;
 	}
 
@@ -1075,7 +1075,7 @@ _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset)
 		priv->hw_addr_scan = nm_utils_hw_addr_gen_random_eth ();
 	}
 
-	nm_device_hw_addr_set (device, priv->hw_addr_scan);
+	nm_device_hw_addr_set (device, priv->hw_addr_scan, "scanning");
 }
 
 static void