From 657949eacdae4ac6f7f91ed29a237e8fd82dc6af Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 14 Feb 2023 21:38:59 +0100 Subject: [PATCH] dhcp: log used DHCP IAID as hexstr This is also the format that we will use to expose it in the lease information. It's the format that dhclient uses. (cherry picked from commit 2fe4313b92cea1d09f8da6d58a5e55b4506b8f9a) --- src/core/devices/nm-device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 13ff62846c..040bc276ab 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -1920,11 +1920,13 @@ out_fail: iaid = nm_utils_create_dhcp_iaid(TRUE, (const guint8 *) iface, strlen(iface)); out_good: if (!log_silent) { + char buf[NM_DHCP_IAID_TO_HEXSTR_BUF_LEN]; + _LOGD(LOGD_DEVICE | LOGD_DHCPX(IS_IPv4) | LOGD_IPX(IS_IPv4), - "ipv%c.dhcp-iaid: using %u (0x%08x) IAID (str: '%s', explicit %d)", + "ipv%c.dhcp-iaid: using %u (%s) IAID (str: '%s', explicit %d)", nm_utils_addr_family_to_char(addr_family), iaid, - iaid, + nm_dhcp_iaid_to_hexstr(iaid, buf), iaid_str, is_explicit); }