From e0aa3726103448097e5ad7cc6f427e142103a321 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sun, 9 Mar 2014 21:33:04 -0400 Subject: activate: export make_socket_fd Also improve logging to print out the parsed address on error. --- src/activate/activate.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'src/activate/activate.c') diff --git a/src/activate/activate.c b/src/activate/activate.c index 23c484ca96..8c58273997 100644 --- 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; } -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; @@ -119,7 +100,7 @@ static int open_sockets(int *epoll_fd, bool accept) { 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)); -- cgit v1.2.3-54-g00ecf