From a481753648da77758b13b82e8d82be8e332f515e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 10 May 2021 17:24:48 +0200 Subject: [PATCH] tree-wide: use af_to_ipv4_ipv6() + af_from_ipv4_ipv6() helpers at various places --- src/core/cgroup.c | 14 ++++++++------ src/core/load-fragment.c | 7 ++----- src/journal-remote/journal-remote.c | 3 ++- src/libsystemd/sd-bus/sd-bus.c | 8 +++----- src/shared/bus-unit-util.c | 8 +++----- src/systemctl/systemctl-show.c | 14 +++++++++----- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 87e8cdf7eeb..961f112eb25 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -4,6 +4,7 @@ #include "sd-messages.h" +#include "af-list.h" #include "alloc-util.h" #include "blockdev-util.h" #include "bpf-devices.h" @@ -594,17 +595,18 @@ void cgroup_context_dump(Unit *u, FILE* f, const char *prefix) { } void cgroup_context_dump_socket_bind_item(const CGroupSocketBindItem *item, FILE *f) { - const char *family = - item->address_family == AF_INET ? "ipv4:" : - item->address_family == AF_INET6 ? "ipv6:" : ""; + const char *family, *colon; + + family = strempty(af_to_ipv4_ipv6(item->address_family)); + colon = isempty(family) ? "" : ":"; if (item->nr_ports == 0) - fprintf(f, " %sany", family); + fprintf(f, " %s%sany", family, colon); else if (item->nr_ports == 1) - fprintf(f, " %s%" PRIu16, family, item->port_min); + fprintf(f, " %s%s%" PRIu16, family, colon, item->port_min); else { uint16_t port_max = item->port_min + item->nr_ports - 1; - fprintf(f, " %s%" PRIu16 "-%" PRIu16, family, item->port_min, port_max); + fprintf(f, " %s%s%" PRIu16 "-%" PRIu16, family, colon, item->port_min, port_max); } } diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index a7d1cb6f121..c2e55bb972d 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -5661,11 +5661,8 @@ int config_parse_cgroup_socket_bind( } if (rvalue) { - if (streq(word, "ipv4")) - af = AF_INET; - else if (streq(word, "ipv6")) - af = AF_INET6; - else { + af = af_from_ipv4_ipv6(word); + if (af == AF_UNSPEC) { log_syntax(unit, LOG_WARNING, filename, line, 0, "Only \"ipv4\" and \"ipv6\" protocols are supported, ignoring."); return 0; diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 9600e5f7324..13461dbe41d 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -8,6 +8,7 @@ #include "sd-daemon.h" +#include "af-list.h" #include "alloc-util.h" #include "def.h" #include "errno-util.h" @@ -498,7 +499,7 @@ static int accept_connection( log_debug("Accepted %s %s connection from %s", type, - socket_address_family(addr) == AF_INET ? "IP" : "IPv6", + af_to_ipv4_ipv6(socket_address_family(addr)), a); *hostname = b; diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 8bcf4f6c506..31f527c571d 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -12,6 +12,7 @@ #include "sd-bus.h" +#include "af-list.h" #include "alloc-util.h" #include "bus-container.h" #include "bus-control.h" @@ -821,11 +822,8 @@ static int parse_tcp_address(sd_bus *b, const char **p, char **guid) { return -EINVAL; if (family) { - if (streq(family, "ipv4")) - hints.ai_family = AF_INET; - else if (streq(family, "ipv6")) - hints.ai_family = AF_INET6; - else + hints.ai_family = af_from_ipv4_ipv6(family); + if (hints.ai_family == AF_UNSPEC) return -EINVAL; } diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index 4d53aaa3da5..54d04aae50c 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "af-list.h" #include "alloc-util.h" #include "bus-error.h" #include "bus-unit-util.h" @@ -879,11 +880,8 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons address_family = eq ? word : NULL; if (address_family) { - if (streq(address_family, "ipv4")) - family = AF_INET; - else if (streq(address_family, "ipv6")) - family = AF_INET6; - else + family = af_from_ipv4_ipv6(address_family); + if (family == AF_UNSPEC) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Only \"ipv4\" and \"ipv6\" protocols are supported"); } diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index d43f1cf0947..4d68e08c804 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -2,6 +2,7 @@ #include +#include "af-list.h" #include "bus-error.h" #include "bus-locator.h" #include "bus-map-properties.h" @@ -1710,22 +1711,25 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m return 1; } else if (STR_IN_SET(name, "SocketBindAllow", "SocketBindDeny")) { uint16_t nr_ports, port_min; - const char *family; int af; r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "(iqq)"); if (r < 0) return bus_log_parse_error(r); while ((r = sd_bus_message_read(m, "(iqq)", &af, &nr_ports, &port_min)) > 0) { - family = af == AF_INET ? "ipv4:" : af == AF_INET6 ? "ipv6:" : ""; + const char *family, *colon; + + family = strempty(af_to_ipv4_ipv6(af)); + colon = isempty(family) ? "" : ":"; + if (nr_ports == 0) - bus_print_property_valuef(name, expected_value, flags, "%sany", family); + bus_print_property_valuef(name, expected_value, flags, "%s%sany", family, colon); else if (nr_ports == 1) bus_print_property_valuef( - name, expected_value, flags, "%s%hu", family, port_min); + name, expected_value, flags, "%s%s%hu", family, colon, port_min); else bus_print_property_valuef( - name, expected_value, flags, "%s%hu-%hu", family, port_min, + name, expected_value, flags, "%s%s%hu-%hu", family, colon, port_min, (uint16_t) (port_min + nr_ports - 1)); } if (r < 0)