extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-17 17:11:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add foreground mode with -F

Browse Source
This commit is contained in:
Nicolas Viennot
2019-11-03 05:11:37 -05:00
parent 7f693a97ae
commit 6e84bab68c
14 changed files with 196 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server.c
View File

@ -152,14 +152,16 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
{
int pair[2];
if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pair) != 0)
fatal("socketpair failed");
if (!tmate_foreground)
if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pair) != 0)
fatal("socketpair failed");
server_proc = proc_start("server", base, 1, server_signal);
if (server_proc == NULL) {
close(pair[1]);
return (pair[0]);
}
close(pair[0]);
if (log_get_level() > 3)
@ -190,7 +192,8 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
if (server_fd == -1)
fatal("couldn't create socket");
server_update_socket();
server_client_create(pair[1]);
if (!tmate_foreground)
server_client_create(pair[1]);
if (lockfd >= 0) {
unlink(lockfile);
@ -207,11 +210,15 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
server_add_accept(0);
if (tmate_foreground)
run_initial_client_cmd();
proc_loop(server_proc, server_loop);
status_prompt_save_history();
#ifdef TMATE
unlink(socket_path);
#endif
exit(0);
}
@ -361,6 +368,7 @@ server_signal(int sig)
int fd;
switch (sig) {
case SIGINT:
case SIGTERM:
server_exit = 1;
server_send_exit();