chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace /var/run with /run in remaining places
[elogind.git]
/
src
/
socket-proxy
/
socket-proxyd.c
diff --git
a/src/socket-proxy/socket-proxyd.c
b/src/socket-proxy/socket-proxyd.c
index 1c64c0e2e5765732ee52ba034d5cb646cc694147..a42e5ae27994d6c835a25792bfc45af089016d68 100644
(file)
--- 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;
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 */
int server_fd, client_fd;
int server_to_client_buffer[2]; /* a pipe */
int client_to_server_buffer[2]; /* a pipe */
@@
-63,19
+65,14
@@
typedef struct Connection {
sd_event_source *server_event_source, *client_event_source;
} 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);
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);
sd_event_source_unref(c->server_event_source);
sd_event_source_unref(c->client_event_source);
@@
-99,14
+96,14
@@
static void context_free(Context *context) {
while ((es = set_steal_first(context->listen)))
sd_event_source_unref(es);
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);
}
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);
int r;
assert(sa);
@@
-117,7
+114,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;
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;
} else if (arg_remote_host[0] == '@') {
sa->un.sun_family = AF_UNIX;
@@
-125,7
+122,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;
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;
} else {
_cleanup_freeaddrinfo_ struct addrinfo *result = NULL;
@@
-154,7
+151,7
@@
static int get_remote_sockaddr(union sockaddr_any *sa, socklen_t *salen) {
}
assert(result);
}
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;
}
log_error("Address too long.");
return -E2BIG;
}
@@
-290,7
+287,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;
if (c->client_fd == -1 && c->client_to_server_buffer_full <= 0)
goto quit;
- r = connection_enable_event_sources(c, sd_event_
ge
t(s));
+ r = connection_enable_event_sources(c, sd_event_
source_get_even
t(s));
if (r < 0)
goto quit;
if (r < 0)
goto quit;
@@
-321,7
+318,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)
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;
else
r = 0;
@@
-333,12
+330,12
@@
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)
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;
if (r < 0) {
else
r = 0;
if (r < 0) {
- log_error("Failed to set up
server
event source: %s", strerror(-r));
+ log_error("Failed to set up
client
event source: %s", strerror(-r));
return r;
}
return r;
}
@@
-376,7
+373,7
@@
static int connect_cb(sd_event_source *s, int fd, uint32_t revents, void *userda
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = connection_enable_event_sources(c, sd_event_
ge
t(s));
+ r = connection_enable_event_sources(c, sd_event_
source_get_even
t(s));
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-388,7
+385,7
@@
fail:
}
static int add_connection_socket(Context *context, sd_event *event, int fd) {
}
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;
socklen_t salen;
Connection *c;
int r;
@@
-411,11
+408,18
@@
static int add_connection_socket(Context *context, sd_event *event, int fd) {
if (!c)
return log_oom();
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;
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;
r = get_remote_sockaddr(&sa, &salen);
if (r < 0)
goto fail;
@@
-429,11
+433,17
@@
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 = 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;
}
if (r < 0) {
log_error("Failed to add connection socket: %s", strerror(-r));
goto fail;
}
+
+ r = sd_event_source_set_enabled(c->client_event_source, SD_EVENT_ONESHOT);
+ if (r < 0) {
+ log_error("Failed to enable oneshot event source: %s", strerror(-r));
+ goto fail;
+ }
} else {
log_error("Failed to connect to remote host: %m");
goto fail;
} else {
log_error("Failed to connect to remote host: %m");
goto fail;
@@
-452,6
+462,7
@@
fail:
}
static int accept_cb(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
}
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;
Context *context = userdata;
int nfd = -1, r;
@@
-461,24
+472,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);
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));
getpeername_pretty(nfd, &peer);
log_debug("New connection from %s", strna(peer));
- r = add_connection_socket(context, sd_event_
ge
t(s), nfd);
+ r = add_connection_socket(context, sd_event_
source_get_even
t(s), nfd);
if (r < 0) {
if (r < 0) {
+ log_error("Failed to accept connection, ignoring: %s", strerror(-r));
close_nointr_nofail(fd);
close_nointr_nofail(fd);
- return r;
}
}
-
- } else if (errno != -EAGAIN)
- log_warning("Failed to accept() socket: %m");
+ }
r = sd_event_source_set_enabled(s, SD_EVENT_ONESHOT);
if (r < 0) {
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;
}
return r;
}
@@
-493,8
+504,6
@@
static int add_listen_socket(Context *context, sd_event *event, int fd) {
assert(event);
assert(fd >= 0);
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();
r = set_ensure_allocated(&context->listen, trivial_hash_func, trivial_compare_func);
if (r < 0) {
log_oom();
@@
-517,7
+526,7
@@
static int add_listen_socket(Context *context, sd_event *event, int fd) {
return r;
}
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;
if (r < 0) {
log_error("Failed to add event source: %s", strerror(-r));
return r;
@@
-618,12
+627,14
@@
int main(int argc, char *argv[]) {
if (r <= 0)
goto finish;
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;
}
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.");
n = sd_listen_fds(1);
if (n < 0) {
log_error("Failed to receive sockets from parent.");