networkd: print the received DHCPv4 address and gateway

It seems that networkd stores in_addr.s_addr contents in reverse
order (little-endian, not network order). This is a bit confusing,
but sd_rtnl evidently likes this order.

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 2ed5e6b63f21a438fddf3f72a77cb861edde07eb..3c683a0ce0fa0ec8bafa2eabd98cb4130236f650 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -379,7 +379,19 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
                 _cleanup_address_free_ Address *addr = NULL;
                 _cleanup_route_free_ Route *rt = NULL;
 
-                log_link_info(link, "received config over DHCPv4");
+                log_struct_link(LOG_INFO, link,
+                                "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
+                                link->ifname,
+                                ADDRESS_FMT_VAL(address),
+                                prefixlen,
+                                ADDRESS_FMT_VAL(gateway),
+                                "ADDRESS=%u.%u.%u.%u",
+                                ADDRESS_FMT_VAL(address),
+                                "PREFIXLEN=%u",
+                                prefixlen,
+                                "GATEWAY=%u.%u.%u.%u",
+                                ADDRESS_FMT_VAL(gateway),
+                                NULL);
 
                 r = address_new_dynamic(&addr);
                 if (r < 0) {

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 9be9330c999f89fc659741f10e2a6c9a0afe0f19..2da852fea4a4e0cb694c4b62571be2df7ac68a37 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -316,3 +316,8 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
 #define log_struct_bridge(level, bridge, ...) log_struct(level, "INTERFACE=%s", bridge->name, __VA_ARGS__)
 
 #define BRIDGE(bridge) "INTERFACE=%s", bridge->name
+#define ADDRESS_FMT_VAL(address)            \
+        (address).s_addr & 0xFF,            \
+        ((address).s_addr >> 8) & 0xFF,     \
+        ((address).s_addr >> 16) & 0xFF,    \
+        (address).s_addr >> 24