diff options
| author | Josh Rahm <rahm@google.com> | 2023-01-27 23:04:47 +0000 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2023-01-27 23:04:47 +0000 |
| commit | e64dc03ff7b867826c7fc76d6fff210ad3382e33 (patch) | |
| tree | 9cf71b02a7ee8f6d39ae1207201dc0745bdb8be5 /client.c | |
| parent | fb15fd116097b98c1b839cfdc76a7d84e206e6d5 (diff) | |
| parent | f5af3cfb211c12897b15e3b5a3b29c4bbb0493a8 (diff) | |
| download | rtmux-e64dc03ff7b867826c7fc76d6fff210ad3382e33.tar.gz rtmux-e64dc03ff7b867826c7fc76d6fff210ad3382e33.tar.bz2 rtmux-e64dc03ff7b867826c7fc76d6fff210ad3382e33.zip | |
Merge remote-tracking branch 'upstream/master' into rahm
Diffstat (limited to 'client.c')
| -rw-r--r-- | client.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -284,6 +284,12 @@ client_main(struct event_base *base, int argc, char **argv, uint64_t flags, log_debug("flags are %#llx", (unsigned long long)client_flags); /* Initialize the client socket and start the server. */ +#ifdef HAVE_SYSTEMD + if (systemd_activated()) { + /* socket-based activation, do not even try to be a client. */ + fd = server_start(client_proc, flags, base, 0, NULL); + } else +#endif fd = client_connect(base, socket_path, client_flags); if (fd == -1) { if (errno == ECONNREFUSED) { @@ -694,6 +700,9 @@ client_dispatch_wait(struct imsg *imsg) !(client_flags & CLIENT_CONTROL), client_file_check_cb, NULL); break; + case MSG_READ_CANCEL: + file_read_cancel(&client_files, imsg); + break; case MSG_WRITE_OPEN: file_write_open(&client_files, client_peer, imsg, 1, !(client_flags & CLIENT_CONTROL), client_file_check_cb, |