From ceea6c1affc5681eac9b2141a4e48454184f7867 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 7 Oct 2020 13:42:54 +0200 Subject: [PATCH] network: introduce IPV4_ADDRESS_FMT_STR macro This also moves ADDRESS_FMT_VAL() macro to networkd-address.h, and renames it to IPV4_ADDRESS_FMT_VAL(). --- src/network/networkd-address.h | 7 +++++++ src/network/networkd-dhcp4.c | 24 ++++++++++++------------ src/network/networkd-ipv4ll.c | 6 +++--- src/network/networkd-link.h | 6 ------ 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h index 431e507851c..d12120f00d2 100644 --- a/src/network/networkd-address.h +++ b/src/network/networkd-address.h @@ -83,3 +83,10 @@ CONFIG_PARSER_PROTOTYPE(config_parse_lifetime); CONFIG_PARSER_PROTOTYPE(config_parse_address_flags); CONFIG_PARSER_PROTOTYPE(config_parse_address_scope); CONFIG_PARSER_PROTOTYPE(config_parse_duplicate_address_detection); + +#define IPV4_ADDRESS_FMT_STR "%u.%u.%u.%u" +#define IPV4_ADDRESS_FMT_VAL(address) \ + be32toh((address).s_addr) >> 24, \ + (be32toh((address).s_addr) >> 16) & 0xFFu, \ + (be32toh((address).s_addr) >> 8) & 0xFFu, \ + be32toh((address).s_addr) & 0xFFu diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 81a95945122..e7dc488e376 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -791,20 +791,20 @@ static int dhcp4_update_address(Link *link, bool announce) { if (r > 0 && !in4_addr_is_null(&router[0])) log_struct(LOG_INFO, LOG_LINK_INTERFACE(link), - LOG_LINK_MESSAGE(link, "DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u", - ADDRESS_FMT_VAL(address), + LOG_LINK_MESSAGE(link, "DHCPv4 address "IPV4_ADDRESS_FMT_STR"/%u via "IPV4_ADDRESS_FMT_STR, + IPV4_ADDRESS_FMT_VAL(address), prefixlen, - ADDRESS_FMT_VAL(router[0])), - "ADDRESS=%u.%u.%u.%u", ADDRESS_FMT_VAL(address), + IPV4_ADDRESS_FMT_VAL(router[0])), + "ADDRESS="IPV4_ADDRESS_FMT_STR, IPV4_ADDRESS_FMT_VAL(address), "PREFIXLEN=%u", prefixlen, - "GATEWAY=%u.%u.%u.%u", ADDRESS_FMT_VAL(router[0])); + "GATEWAY="IPV4_ADDRESS_FMT_STR, IPV4_ADDRESS_FMT_VAL(router[0])); else log_struct(LOG_INFO, LOG_LINK_INTERFACE(link), - LOG_LINK_MESSAGE(link, "DHCPv4 address %u.%u.%u.%u/%u", - ADDRESS_FMT_VAL(address), + LOG_LINK_MESSAGE(link, "DHCPv4 address "IPV4_ADDRESS_FMT_STR"/%u", + IPV4_ADDRESS_FMT_VAL(address), prefixlen), - "ADDRESS=%u.%u.%u.%u", ADDRESS_FMT_VAL(address), + "ADDRESS="IPV4_ADDRESS_FMT_STR, IPV4_ADDRESS_FMT_VAL(address), "PREFIXLEN=%u", prefixlen); } @@ -955,8 +955,8 @@ static int dhcp_server_is_deny_listed(Link *link, sd_dhcp_client *client) { if (set_contains(link->network->dhcp_deny_listed_ip, UINT32_TO_PTR(addr.s_addr))) { log_struct(LOG_DEBUG, LOG_LINK_INTERFACE(link), - LOG_LINK_MESSAGE(link, "DHCPv4 IP '%u.%u.%u.%u' found in deny-listed IP addresses, ignoring offer", - ADDRESS_FMT_VAL(addr))); + LOG_LINK_MESSAGE(link, "DHCPv4 server IP address "IPV4_ADDRESS_FMT_STR" found in deny-list, ignoring offer", + IPV4_ADDRESS_FMT_VAL(addr))); return true; } @@ -983,8 +983,8 @@ static int dhcp_server_is_allow_listed(Link *link, sd_dhcp_client *client) { if (set_contains(link->network->dhcp_allow_listed_ip, UINT32_TO_PTR(addr.s_addr))) { log_struct(LOG_DEBUG, LOG_LINK_INTERFACE(link), - LOG_LINK_MESSAGE(link, "DHCPv4 IP '%u.%u.%u.%u' found in allow-listed IP addresses, accepting offer", - ADDRESS_FMT_VAL(addr))); + LOG_LINK_MESSAGE(link, "DHCPv4 server IP address "IPV4_ADDRESS_FMT_STR" found in allow-list, accepting offer", + IPV4_ADDRESS_FMT_VAL(addr))); return true; } diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c index b0e0a97ad8d..03f29e3b667 100644 --- a/src/network/networkd-ipv4ll.c +++ b/src/network/networkd-ipv4ll.c @@ -23,7 +23,7 @@ static int ipv4ll_address_lost(Link *link) { if (r < 0) return 0; - log_link_debug(link, "IPv4 link-local release %u.%u.%u.%u", ADDRESS_FMT_VAL(addr)); + log_link_debug(link, "IPv4 link-local release "IPV4_ADDRESS_FMT_STR, IPV4_ADDRESS_FMT_VAL(addr)); r = address_new(&address); if (r < 0) @@ -79,8 +79,8 @@ static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) { else if (r < 0) return r; - log_link_debug(link, "IPv4 link-local claim %u.%u.%u.%u", - ADDRESS_FMT_VAL(address)); + log_link_debug(link, "IPv4 link-local claim "IPV4_ADDRESS_FMT_STR, + IPV4_ADDRESS_FMT_VAL(address)); r = address_new(&ll_addr); if (r < 0) diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 08cfc60c1f4..b712bb262f3 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -243,9 +243,3 @@ int log_link_message_full_errno(Link *link, sd_netlink_message *m, int level, in #define log_link_message_notice_errno(link, m, err, msg) log_link_message_full_errno(link, m, LOG_NOTICE, err, msg) #define log_link_message_info_errno(link, m, err, msg) log_link_message_full_errno(link, m, LOG_INFO, err, msg) #define log_link_message_debug_errno(link, m, err, msg) log_link_message_full_errno(link, m, LOG_DEBUG, err, msg) - -#define ADDRESS_FMT_VAL(address) \ - be32toh((address).s_addr) >> 24, \ - (be32toh((address).s_addr) >> 16) & 0xFFu, \ - (be32toh((address).s_addr) >> 8) & 0xFFu, \ - be32toh((address).s_addr) & 0xFFu -- 2.47.3