activate: export make_socket_fd

Also improve logging to print out the parsed address on error.

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 23c484ca968e96ed42a6af481815f22a68322e43..8c582739976a2e4116b99cb1721c95083575db1c 100644 (file)
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -59,25 +59,6 @@ static int add_epoll(int epoll_fd, int fd) {
         return 0;
 }
 
         return 0;
 }
 

-static int make_socket_fd(const char* address, int flags) {
-        SocketAddress a;
-        int fd, r;
-
-        r = socket_address_parse(&a, address);
-        if (r < 0) {
-                log_error("Failed to parse socket: %s", strerror(-r));
-                return r;
-        }
-
-        fd = socket_address_listen(&a, flags, SOMAXCONN, SOCKET_ADDRESS_DEFAULT, NULL, false, false, 0755, 0644, NULL);
-        if (fd < 0) {
-                log_error("Failed to listen: %s", strerror(-r));
-                return fd;
-        }
-
-        return fd;
-}
-

 static int open_sockets(int *epoll_fd, bool accept) {
         char **address;
         int n, fd, r;
 static int open_sockets(int *epoll_fd, bool accept) {
         char **address;
         int n, fd, r;


@@ -119,7 +100,7 @@ static int open_sockets(int *epoll_fd, bool accept) {
 
         STRV_FOREACH(address, arg_listen) {
 
 
         STRV_FOREACH(address, arg_listen) {
 

-                fd = make_socket_fd(*address, SOCK_STREAM | (arg_accept*SOCK_CLOEXEC));
+                fd = make_socket_fd(LOG_DEBUG, *address, SOCK_STREAM | (arg_accept*SOCK_CLOEXEC));

                 if (fd < 0) {
                         log_open();
                         log_error("Failed to open '%s': %s", *address, strerror(-fd));
                 if (fd < 0) {
                         log_open();
                         log_error("Failed to open '%s': %s", *address, strerror(-fd));

diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
index c8be17a1d537c4b2f792ad33fe38b98efbc580a4..1e78dd2569cf2002f649962666f0d3f062cd12d7 100644 (file)
--- a/src/shared/socket-label.c
+++ b/src/shared/socket-label.c
@@ -143,3 +143,33 @@ int socket_address_listen(
 
         return r;
 }
 
         return r;
 }

+
+int make_socket_fd(int log_level, const char* address, int flags) {
+        SocketAddress a;
+        int fd, r;
+
+        r = socket_address_parse(&a, address);
+        if (r < 0) {
+                log_error("Failed to parse socket: %s", strerror(-r));
+                return r;
+        }
+
+        fd = socket_address_listen(&a, flags, SOMAXCONN, SOCKET_ADDRESS_DEFAULT,
+                                   NULL, false, false, 0755, 0644, NULL);
+        if (fd < 0 || log_get_max_level() >= log_level) {
+                char _cleanup_free_ *p = NULL;
+
+                r = socket_address_print(&a, &p);
+                if (r < 0) {
+                        log_error("socket_address_print(): %s", strerror(-r));
+                        return r;
+                }
+
+                if (fd < 0)
+                        log_error("Failed to listen on %s: %s", p, strerror(-r));
+                else
+                        log_full(log_level, "Listening on %s", p);
+        }
+
+        return fd;
+}

diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h
index 84ebc302feac10c649d6515c2c04050f85ae4ac7..efaaf82ab1fd57f626fb1a8b5c83bd453e2235f6 100644 (file)
--- a/src/shared/socket-util.h
+++ b/src/shared/socket-util.h
@@ -84,6 +84,7 @@ int socket_address_listen(
                 mode_t directory_mode,
                 mode_t socket_mode,
                 const char *label);
                 mode_t directory_mode,
                 mode_t socket_mode,
                 const char *label);

+int make_socket_fd(int log_level, const char* address, int flags);

 
 bool socket_address_is(const SocketAddress *a, const char *s, int type);
 bool socket_address_is_netlink(const SocketAddress *a, const char *s);
 
 bool socket_address_is(const SocketAddress *a, const char *s, int type);
 bool socket_address_is_netlink(const SocketAddress *a, const char *s);