activate: export make_socket_fd

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

2 files changed, 31 insertions, 0 deletions

diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
index c8be17a1d5..1e78dd2569 100644
--- a/src/shared/socket-label.c
+++ b/src/shared/socket-label.c
@@ -143,3 +143,33 @@ int socket_address_listen(
 
         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 84ebc302fe..efaaf82ab1 100644
--- 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);
+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);