chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "socket-proxyd: Add --listener option for listener/destination pairs."
[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 56e660de57cb6b50cddd7b2d4c4a64ce22309c55..432558d190376955432267d41e5126af7004e1a5 100644
(file)
--- a/
src/socket-proxy/socket-proxyd.c
+++ b/
src/socket-proxy/socket-proxyd.c
@@
-287,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;
@@
-373,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;
@@
-477,7
+477,7
@@
static int accept_cb(sd_event_source *s, int fd, uint32_t revents, void *userdat
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) {
close_nointr_nofail(fd);
return r;
if (r < 0) {
close_nointr_nofail(fd);
return r;
@@
-626,7
+626,7
@@
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;