diff options
| -rw-r--r-- | src/core/load-fragment.c | 2 | ||||
| -rw-r--r-- | src/shared/socket-util.c | 29 | ||||
| -rw-r--r-- | src/shared/socket-util.h | 1 |
3 files changed, 21 insertions, 11 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 3865017d97..5fa476c9f0 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -356,7 +356,7 @@ int config_parse_socket_listen(const char *unit, log_syntax(unit, LOG_ERR, filename, line, -r, "Failed to resolve unit specifiers on %s, ignoring: %s", rvalue, strerror(-r)); - r = socket_address_parse(&p->address, k ? k : rvalue); + r = socket_address_parse_and_warn(&p->address, k ? k : rvalue); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, -r, "Failed to parse address value, ignoring: %s", rvalue); diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c index 94a0663345..e8bb10dc9b 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -51,11 +51,6 @@ int socket_address_parse(SocketAddress *a, const char *s) { if (*s == '[') { /* IPv6 in [x:.....:z]:p notation */ - if (!socket_ipv6_is_supported()) { - log_warning("Binding to IPv6 address not available since kernel does not support IPv6."); - return -EAFNOSUPPORT; - } - e = strchr(s+1, ']'); if (!e) return -EINVAL; @@ -140,11 +135,6 @@ int socket_address_parse(SocketAddress *a, const char *s) { if (idx == 0) return -EINVAL; - if (!socket_ipv6_is_supported()) { - log_warning("Binding to interface is not available since kernel does not support IPv6."); - return -EAFNOSUPPORT; - } - a->sockaddr.in6.sin6_family = AF_INET6; a->sockaddr.in6.sin6_port = htons((uint16_t) u); a->sockaddr.in6.sin6_scope_id = idx; @@ -178,6 +168,25 @@ int socket_address_parse(SocketAddress *a, const char *s) { return 0; } +int socket_address_parse_and_warn(SocketAddress *a, const char *s) { + SocketAddress b; + int r; + + /* Similar to socket_address_parse() but warns for IPv6 sockets when we don't support them. */ + + r = socket_address_parse(&b, s); + if (r < 0) + return r; + + if (!socket_ipv6_is_supported() && b.sockaddr.sa.sa_family == AF_INET6) { + log_warning("Binding to IPv6 address not available since kernel does not support IPv6."); + return -EAFNOSUPPORT; + } + + *a = b; + return 0; +} + int socket_address_parse_netlink(SocketAddress *a, const char *s) { int family; unsigned group = 0; diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h index 1f4823009e..538cf59174 100644 --- a/src/shared/socket-util.h +++ b/src/shared/socket-util.h @@ -66,6 +66,7 @@ typedef enum SocketAddressBindIPv6Only { #define socket_address_family(a) ((a)->sockaddr.sa.sa_family) int socket_address_parse(SocketAddress *a, const char *s); +int socket_address_parse_and_warn(SocketAddress *a, const char *s); int socket_address_parse_netlink(SocketAddress *a, const char *s); int socket_address_print(const SocketAddress *a, char **p); int socket_address_verify(const SocketAddress *a) _pure_; |