summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2021-07-07 09:56:50 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2021-07-13 09:40:16 +0200
commit288f7748877984bcfac2fbc062450541635e8baf (patch)
tree355747d0a294bddfab3191656ae42e02c35a63b2
parentb793925889a3137b77fa2b8679144b1e4948d246 (diff)
downloadNetworkManager-288f7748877984bcfac2fbc062450541635e8baf.tar.gz
acd: log the MAC when announcing an IP
(cherry picked from commit 314024ea968e44199e44969b8e948f97ed15965a) (cherry picked from commit 786cd854d7503aef0ea1718253b50f629c8b17fc)
-rw-r--r--src/core/devices/nm-acd-manager.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/core/devices/nm-acd-manager.c b/src/core/devices/nm-acd-manager.c
index b95f90fd45..81a28797bb 100644
--- a/src/core/devices/nm-acd-manager.c
+++ b/src/core/devices/nm-acd-manager.c
@@ -188,6 +188,7 @@ acd_event(int fd, GIOCondition condition, gpointer data)
char to_string_buffer[ACD_EVENT_TO_STRING_BUF_SIZE];
gs_free char *hwaddr_str = NULL;
gboolean check_probing_done = FALSE;
+ char buf[ETH_ALEN * 3];
switch (event->event) {
case N_ACD_EVENT_READY:
@@ -202,8 +203,9 @@ acd_event(int fd, GIOCondition condition, gpointer data)
nm_platform_link_get_name(NM_PLATFORM_GET, self->ifindex),
acd_error_to_string(r));
} else {
- _LOGD("announcing address %s",
- _nm_utils_inet4_ntop(info->address, address_str));
+ _LOGD("announcing address %s (hw-addr %s)",
+ _nm_utils_inet4_ntop(info->address, address_str),
+ _nm_utils_hwaddr_ntoa(self->hwaddr, ETH_ALEN, TRUE, buf, sizeof(buf)));
}
}
check_probing_done = TRUE;
@@ -394,6 +396,7 @@ nm_acd_manager_announce_addresses(NMAcdManager *self)
int r;
int fd;
gboolean success = TRUE;
+ char buf[ETH_ALEN * 3];
r = acd_init(self);
if (r) {
@@ -428,7 +431,9 @@ nm_acd_manager_announce_addresses(NMAcdManager *self)
acd_error_to_string(r));
success = FALSE;
} else
- _LOGD("announcing address %s", _nm_utils_inet4_ntop(info->address, sbuf));
+ _LOGD("announcing address %s (hw-addr %s)",
+ _nm_utils_inet4_ntop(info->address, sbuf),
+ _nm_utils_hwaddr_ntoa(self->hwaddr, ETH_ALEN, TRUE, buf, sizeof(buf)));
}
}