mwtkrayer
/
splex
forked from github/abduco
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Make client termination more robust by explicitly sending exit messages

This commit is contained in:
Marc André Tanner 2014-06-24 10:55:44 +02:00
parent 9e29a968d8
commit 4b4c08457f
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client.c
View File

@ -77,6 +77,8 @@ static int client_mainloop() {
client.need_resize = true; client.need_resize = true;
break; break;
case MSG_EXIT: case MSG_EXIT:
client_send_packet(&pkt);
close(server.socket);
return pkt.u.i; return pkt.u.i;
} }
} }
@ -96,6 +98,7 @@ static int client_mainloop() {
pkt.type = MSG_DETACH; pkt.type = MSG_DETACH;
pkt.len = 0; pkt.len = 0;
client_send_packet(&pkt); client_send_packet(&pkt);
close(server.socket);
return -1; return -1;
} else if (!client.readonly) { } else if (!client.readonly) {
client_send_packet(&pkt); client_send_packet(&pkt);

37
server.c
View File

@ -186,23 +186,6 @@ static void server_mainloop() {
pty_data = server_read_pty(&server_packet); pty_data = server_read_pty(&server_packet);
for (Client **prev_next = &server.clients, *c = server.clients; c;) { for (Client **prev_next = &server.clients, *c = server.clients; c;) {
if (c->state == STATE_DISCONNECTED) {
bool first = (c == server.clients);
Client *t = c->next;
client_free(c);
*prev_next = c = t;
if (first && server.clients) {
Packet pkt = {
.type = MSG_RESIZE,
.len = 0,
};
server_send_packet(server.clients, &pkt);
} else if (!server.clients) {
server_mark_socket_exec(false, true);
}
continue;
}
if (FD_ISSET(c->socket, &readfds) && server_recv_packet(c, &client_packet)) { if (FD_ISSET(c->socket, &readfds) && server_recv_packet(c, &client_packet)) {
switch (client_packet.type) { switch (client_packet.type) {
case MSG_CONTENT: case MSG_CONTENT:
@ -221,13 +204,31 @@ static void server_mainloop() {
kill(-server.pid, SIGWINCH); kill(-server.pid, SIGWINCH);
break; break;
case MSG_DETACH: case MSG_DETACH:
c->state = STATE_DETACHED; case MSG_EXIT:
c->state = STATE_DISCONNECTED;
break; break;
default: /* ignore package */ default: /* ignore package */
break; break;
} }
} }
if (c->state == STATE_DISCONNECTED) {
bool first = (c == server.clients);
Client *t = c->next;
client_free(c);
*prev_next = c = t;
if (first && server.clients) {
Packet pkt = {
.type = MSG_RESIZE,
.len = 0,
};
server_send_packet(server.clients, &pkt);
} else if (!server.clients) {
server_mark_socket_exec(false, true);
}
continue;
}
FD_SET_MAX(c->socket, &new_readfds, new_fdmax); FD_SET_MAX(c->socket, &new_readfds, new_fdmax);
if (pty_data) if (pty_data)