summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-05-19 12:27:32 +0200
committerThomas Haller <thaller@redhat.com>2022-05-31 18:32:33 +0200
commitd81a9aec31bf71c9a53fed183092c7170a00a289 (patch)
treea06061e84dfc27a2f9af73fa1daef04e41609f2b
parent65992349d026e3536b79f11e336af70aa7a0229b (diff)
downloadNetworkManager-d81a9aec31bf71c9a53fed183092c7170a00a289.tar.gz
glib-aux/logging: add LOGD_DHCP_af() helper macro
-rw-r--r--src/libnm-glib-aux/nm-logging-fwd.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/libnm-glib-aux/nm-logging-fwd.h b/src/libnm-glib-aux/nm-logging-fwd.h
index 0e715c5047..72e5723c28 100644
--- a/src/libnm-glib-aux/nm-logging-fwd.h
+++ b/src/libnm-glib-aux/nm-logging-fwd.h
@@ -59,7 +59,16 @@ typedef enum {
LOGD_IP = LOGD_IP4 | LOGD_IP6,
#define LOGD_DHCPX(is_ipv4) ((is_ipv4) ? LOGD_DHCP4 : LOGD_DHCP6)
-#define LOGD_IPX(is_ipv4) ((is_ipv4) ? LOGD_IP4 : LOGD_IP6)
+
+#define LOGD_DHCP_af(addr_family) \
+ ({ \
+ const int _addr_family_1 = (addr_family); \
+ \
+ (_addr_family_1 == AF_UNSPEC ? LOGD_DHCP \
+ : (NM_IS_IPv4(_addr_family_1) ? LOGD_DHCP4 : LOGD_DHCP6)); \
+ })
+
+#define LOGD_IPX(is_ipv4) ((is_ipv4) ? LOGD_IP4 : LOGD_IP6)
} NMLogDomain;