socket-util: library calls shouldn't log on their own

[elogind.git] / src / shared / socket-util.c

diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
index 4a6bf50b17e9f91f274fab7e8236270378e781d6..62f99b322ec68b9d6ece112c50fd28b3b25c71a0 100644 (file)
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -35,6 +35,7 @@
 #include "socket-util.h"
 #include "missing.h"
 #include "fileio.h"
 #include "socket-util.h"
 #include "missing.h"
 #include "fileio.h"

+#include "formats-util.h"

 
 int socket_address_parse(SocketAddress *a, const char *s) {
         char *e, *n;
 
 int socket_address_parse(SocketAddress *a, const char *s) {
         char *e, *n;


@@ -50,11 +51,6 @@ int socket_address_parse(SocketAddress *a, const char *s) {
         if (*s == '[') {
                 /* IPv6 in [x:.....:z]:p notation */
 
         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;
                 e = strchr(s+1, ']');
                 if (!e)
                         return -EINVAL;


@@ -139,11 +135,6 @@ int socket_address_parse(SocketAddress *a, const char *s) {
                                 if (idx == 0)
                                         return -EINVAL;
 
                                 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;
                                 a->sockaddr.in6.sin6_family = AF_INET6;
                                 a->sockaddr.in6.sin6_port = htons((uint16_t) u);
                                 a->sockaddr.in6.sin6_scope_id = idx;


@@ -177,6 +168,25 @@ int socket_address_parse(SocketAddress *a, const char *s) {
         return 0;
 }
 
         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;
 int socket_address_parse_netlink(SocketAddress *a, const char *s) {
         int family;
         unsigned group = 0;


@@ -652,13 +662,13 @@ int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret)
 
                 r = sockaddr_pretty(&sa->sa, salen, true, true, &ret);
                 if (r < 0)
 
                 r = sockaddr_pretty(&sa->sa, salen, true, true, &ret);
                 if (r < 0)

-                        return log_error_errno(r, "sockadd_pretty() failed: %m");
+                        return r;

 
                 log_debug_errno(saved_errno, "getnameinfo(%s) failed: %m", ret);
         } else {
                 ret = strdup(host);
                 if (!ret)
 
                 log_debug_errno(saved_errno, "getnameinfo(%s) failed: %m", ret);
         } else {
                 ret = strdup(host);
                 if (!ret)

-                        return log_oom();
+                        return -ENOMEM;

         }
 
         *_ret = ret;
         }
 
         *_ret = ret;


@@ -673,7 +683,7 @@ int getnameinfo_pretty(int fd, char **ret) {
         assert(ret);
 
         if (getsockname(fd, &sa.sa, &salen) < 0)
         assert(ret);
 
         if (getsockname(fd, &sa.sa, &salen) < 0)

-                return log_error_errno(errno, "getsockname(%d) failed: %m", fd);
+                return -errno;

 
         return socknameinfo_pretty(&sa, salen, ret);
 }
 
         return socknameinfo_pretty(&sa, salen, ret);
 }