X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsocket-proxy%2Fsocket-proxyd.c;h=ac47c851507b2516e01835bdac6dd32d675189c1;hb=4bb40e8125ae0a83a13cb8e020950975eeeb1ad2;hp=12d58d4406d1ea81ad2f160a103c08c76f9b7d8e;hpb=b7484e2a58038c57591457c1439505607bdcd833;p=elogind.git diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index 12d58d440..ac47c8515 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -53,6 +53,8 @@ typedef struct Context { } Context; typedef struct Connection { + Context *context; + int server_fd, client_fd; int server_to_client_buffer[2]; /* a pipe */ int client_to_server_buffer[2]; /* a pipe */ @@ -63,29 +65,22 @@ typedef struct Connection { sd_event_source *server_event_source, *client_event_source; } Connection; -union sockaddr_any { - struct sockaddr sa; - struct sockaddr_un un; - struct sockaddr_in in; - struct sockaddr_in6 in6; - struct sockaddr_storage storage; -}; - static const char *arg_remote_host = NULL; static void connection_free(Connection *c) { assert(c); + if (c->context) + set_remove(c->context->connections, c); + sd_event_source_unref(c->server_event_source); sd_event_source_unref(c->client_event_source); - if (c->server_fd >= 0) - close_nointr_nofail(c->server_fd); - if (c->client_fd >= 0) - close_nointr_nofail(c->client_fd); + safe_close(c->server_fd); + safe_close(c->client_fd); - close_pipe(c->server_to_client_buffer); - close_pipe(c->client_to_server_buffer); + safe_close_pair(c->server_to_client_buffer); + safe_close_pair(c->client_to_server_buffer); free(c); } @@ -99,14 +94,14 @@ static void context_free(Context *context) { while ((es = set_steal_first(context->listen))) sd_event_source_unref(es); - while ((c = set_steal_first(context->connections))) + while ((c = set_first(context->connections))) connection_free(c); set_free(context->listen); set_free(context->connections); } -static int get_remote_sockaddr(union sockaddr_any *sa, socklen_t *salen) { +static int get_remote_sockaddr(union sockaddr_union *sa, socklen_t *salen) { int r; assert(sa); @@ -117,7 +112,7 @@ static int get_remote_sockaddr(union sockaddr_any *sa, socklen_t *salen) { strncpy(sa->un.sun_path, arg_remote_host, sizeof(sa->un.sun_path)-1); sa->un.sun_path[sizeof(sa->un.sun_path)-1] = 0; - *salen = offsetof(union sockaddr_any, un.sun_path) + strlen(sa->un.sun_path); + *salen = offsetof(union sockaddr_union, un.sun_path) + strlen(sa->un.sun_path); } else if (arg_remote_host[0] == '@') { sa->un.sun_family = AF_UNIX; @@ -125,7 +120,7 @@ static int get_remote_sockaddr(union sockaddr_any *sa, socklen_t *salen) { strncpy(sa->un.sun_path+1, arg_remote_host+1, sizeof(sa->un.sun_path)-2); sa->un.sun_path[sizeof(sa->un.sun_path)-1] = 0; - *salen = offsetof(union sockaddr_any, un.sun_path) + 1 + strlen(sa->un.sun_path + 1); + *salen = offsetof(union sockaddr_union, un.sun_path) + 1 + strlen(sa->un.sun_path + 1); } else { _cleanup_freeaddrinfo_ struct addrinfo *result = NULL; @@ -154,7 +149,7 @@ static int get_remote_sockaddr(union sockaddr_any *sa, socklen_t *salen) { } assert(result); - if (result->ai_addrlen > sizeof(union sockaddr_any)) { + if (result->ai_addrlen > sizeof(union sockaddr_union)) { log_error("Address too long."); return -E2BIG; } @@ -227,8 +222,7 @@ static int connection_shovel( shoveled = true; } else if (z == 0 || errno == EPIPE || errno == ECONNRESET) { *from_source = sd_event_source_unref(*from_source); - close_nointr_nofail(*from); - *from = -1; + *from = safe_close(*from); } else if (errno != EAGAIN && errno != EINTR) { log_error("Failed to splice: %m"); return -errno; @@ -242,8 +236,7 @@ static int connection_shovel( shoveled = true; } else if (z == 0 || errno == EPIPE || errno == ECONNRESET) { *to_source = sd_event_source_unref(*to_source); - close_nointr_nofail(*to); - *to = -1; + *to = safe_close(*to); } else if (errno != EAGAIN && errno != EINTR) { log_error("Failed to splice: %m"); return -errno; @@ -290,7 +283,7 @@ static int traffic_cb(sd_event_source *s, int fd, uint32_t revents, void *userda if (c->client_fd == -1 && c->client_to_server_buffer_full <= 0) goto quit; - r = connection_enable_event_sources(c, sd_event_get(s)); + r = connection_enable_event_sources(c, sd_event_source_get_event(s)); if (r < 0) goto quit; @@ -321,7 +314,7 @@ static int connection_enable_event_sources(Connection *c, sd_event *event) { if (c->server_event_source) r = sd_event_source_set_io_events(c->server_event_source, a); else if (c->server_fd >= 0) - r = sd_event_add_io(event, c->server_fd, a, traffic_cb, c, &c->server_event_source); + r = sd_event_add_io(event, &c->server_event_source, c->server_fd, a, traffic_cb, c); else r = 0; @@ -333,7 +326,7 @@ static int connection_enable_event_sources(Connection *c, sd_event *event) { if (c->client_event_source) r = sd_event_source_set_io_events(c->client_event_source, b); else if (c->client_fd >= 0) - r = sd_event_add_io(event, c->client_fd, b, traffic_cb, c, &c->client_event_source); + r = sd_event_add_io(event, &c->client_event_source, c->client_fd, b, traffic_cb, c); else r = 0; @@ -376,7 +369,7 @@ static int connect_cb(sd_event_source *s, int fd, uint32_t revents, void *userda if (r < 0) goto fail; - r = connection_enable_event_sources(c, sd_event_get(s)); + r = connection_enable_event_sources(c, sd_event_source_get_event(s)); if (r < 0) goto fail; @@ -388,7 +381,7 @@ fail: } static int add_connection_socket(Context *context, sd_event *event, int fd) { - union sockaddr_any sa = {}; + union sockaddr_union sa = {}; socklen_t salen; Connection *c; int r; @@ -399,7 +392,7 @@ static int add_connection_socket(Context *context, sd_event *event, int fd) { if (set_size(context->connections) > CONNECTIONS_MAX) { log_warning("Hit connection limit, refusing connection."); - close_nointr_nofail(fd); + safe_close(fd); return 0; } @@ -411,11 +404,18 @@ static int add_connection_socket(Context *context, sd_event *event, int fd) { if (!c) return log_oom(); + c->context = context; c->server_fd = fd; c->client_fd = -1; c->server_to_client_buffer[0] = c->server_to_client_buffer[1] = -1; c->client_to_server_buffer[0] = c->client_to_server_buffer[1] = -1; + r = set_put(context->connections, c); + if (r < 0) { + free(c); + return log_oom(); + } + r = get_remote_sockaddr(&sa, &salen); if (r < 0) goto fail; @@ -429,7 +429,7 @@ static int add_connection_socket(Context *context, sd_event *event, int fd) { r = connect(c->client_fd, &sa.sa, salen); if (r < 0) { if (errno == EINPROGRESS) { - r = sd_event_add_io(event, c->client_fd, EPOLLOUT, connect_cb, c, &c->client_event_source); + r = sd_event_add_io(event, &c->client_event_source, c->client_fd, EPOLLOUT, connect_cb, c); if (r < 0) { log_error("Failed to add connection socket: %s", strerror(-r)); goto fail; @@ -458,6 +458,7 @@ fail: } static int accept_cb(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_free_ char *peer = NULL; Context *context = userdata; int nfd = -1, r; @@ -467,24 +468,24 @@ static int accept_cb(sd_event_source *s, int fd, uint32_t revents, void *userdat assert(context); nfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC); - if (nfd >= 0) { - _cleanup_free_ char *peer = NULL; - + if (nfd < 0) { + if (errno != -EAGAIN) + log_warning("Failed to accept() socket: %m"); + } else { getpeername_pretty(nfd, &peer); log_debug("New connection from %s", strna(peer)); - r = add_connection_socket(context, sd_event_get(s), nfd); + r = add_connection_socket(context, sd_event_source_get_event(s), nfd); if (r < 0) { - close_nointr_nofail(fd); - return r; + log_error("Failed to accept connection, ignoring: %s", strerror(-r)); + safe_close(fd); } - - } else if (errno != -EAGAIN) - log_warning("Failed to accept() socket: %m"); + } r = sd_event_source_set_enabled(s, SD_EVENT_ONESHOT); if (r < 0) { - log_error("Error %d while re-enabling listener with ONESHOT: %s", r, strerror(-r)); + log_error("Error while re-enabling listener with ONESHOT: %s", strerror(-r)); + sd_event_exit(sd_event_source_get_event(s), r); return r; } @@ -499,8 +500,6 @@ static int add_listen_socket(Context *context, sd_event *event, int fd) { assert(event); assert(fd >= 0); - log_info("Listening on %i", fd); - r = set_ensure_allocated(&context->listen, trivial_hash_func, trivial_compare_func); if (r < 0) { log_oom(); @@ -523,7 +522,7 @@ static int add_listen_socket(Context *context, sd_event *event, int fd) { return r; } - r = sd_event_add_io(event, fd, EPOLLIN, accept_cb, context, &source); + r = sd_event_add_io(event, &source, fd, EPOLLIN, accept_cb, context); if (r < 0) { log_error("Failed to add event source: %s", strerror(-r)); return r; @@ -624,12 +623,14 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; - r = sd_event_new(&event); + r = sd_event_default(&event); if (r < 0) { log_error("Failed to allocate event loop: %s", strerror(-r)); goto finish; } + sd_event_set_watchdog(event, true); + n = sd_listen_fds(1); if (n < 0) { log_error("Failed to receive sockets from parent.");