v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Fix client cleanup screen after exit

Browse Source
This commit is contained in:
Nicolas Viennot 2013-06-19 02:32:27 -04:00
parent 17a0f65351
commit 316bd7a9f8
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server.c
View File

@ -211,8 +211,7 @@ server_start(int lockfd, char *lockfile)
void void
server_loop(void) server_loop(void)
{ {
while (!server_shutdown) { while (!server_should_shutdown()) {
//while (!server_should_shutdown()) {
event_loop(EVLOOP_ONCE); event_loop(EVLOOP_ONCE);
server_window_loop(); server_window_loop();
@ -237,6 +236,9 @@ server_should_shutdown(void)
if (ARRAY_ITEM(&clients, i) != NULL) if (ARRAY_ITEM(&clients, i) != NULL)
return (0); return (0);
} }
#ifdef TMATE_SLAVE
return server_shutdown;
#endif
return (1); return (1);
} }

33
tmate-ssh-client.c
View File

@ -4,6 +4,13 @@
#include <libssh/callbacks.h> #include <libssh/callbacks.h>
extern int server_shutdown; extern int server_shutdown;
extern void server_send_shutdown(void);
#define request_termination(str, ...) do { \
tmate_info(str, ## __VA_ARGS__); \
server_shutdown = 1; \
server_send_shutdown(); \
} while(0)
static void consume_channel(struct tmate_ssh_client *client) static void consume_channel(struct tmate_ssh_client *client)
{ {
@ -12,17 +19,20 @@ static void consume_channel(struct tmate_ssh_client *client)
for (;;) { for (;;) {
tmate_decoder_get_buffer(client->decoder, &buf, &len); tmate_decoder_get_buffer(client->decoder, &buf, &len);
if (len == 0) if (len == 0) {
tmate_fatal("Input buffer full"); request_termination("Decoder buffer full");
break;
}
len = ssh_channel_read_nonblocking(client->channel, len = ssh_channel_read_nonblocking(client->channel,
buf, len, 0); buf, len, 0);
if (len < 0) { if (len < 0) {
if (!ssh_is_connected(client->session)) if (!ssh_is_connected(client->session))
tmate_fatal("Disconnected"); request_termination("Disconnected");
else
tmate_fatal("Error reading from channel: %s", request_termination("Error reading from channel: %s",
ssh_get_error(client->session)); ssh_get_error(client->session));
break;
} }
if (len == 0) if (len == 0)
break; break;
@ -55,6 +65,9 @@ static void flush_input_stream(struct tmate_ssh_client *client)
ssize_t len, written; ssize_t len, written;
char *buf; char *buf;
if (server_shutdown)
return;
for (;;) { for (;;) {
len = evbuffer_get_length(evb); len = evbuffer_get_length(evb);
if (!len) if (!len)
@ -63,9 +76,11 @@ static void flush_input_stream(struct tmate_ssh_client *client)
buf = evbuffer_pullup(evb, -1); buf = evbuffer_pullup(evb, -1);
written = ssh_channel_write(client->channel, buf, len); written = ssh_channel_write(client->channel, buf, len);
if (written < 0) if (written < 0) {
tmate_fatal("Error writing to channel: %s", request_termination("Error writing to channel: %s",
ssh_get_error(client->session)); ssh_get_error(client->session));
break;
}
evbuffer_drain(evb, written); evbuffer_drain(evb, written);
} }