github
/
abduco
mirror of https://github.com/martanne/abduco
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge 972ca8ab94 into 8c32909a15

This commit is contained in:
Jeremy Bobbin 2021-01-30 09:49:15 +00:00 committed by GitHub
parent 8c32909a15 972ca8ab94
commit f253e62803
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
abduco.c
View File

@ -518,8 +518,6 @@ static bool attach_session(const char *name, const bool terminate) {
close(server.socket);
if ((server.socket = session_connect(name)) == -1)
return false;
if (server_set_socket_non_blocking(server.socket) == -1)
return false;
struct sigaction sa;
sa.sa_flags = 0;
@ -529,9 +527,25 @@ static bool attach_session(const char *name, const bool terminate) {
sa.sa_handler = SIG_IGN;
sigaction(SIGPIPE, &sa, NULL);
client_setup_terminal();
int status = client_mainloop();
client_restore_terminal();
Packet pkt = {
.type = MSG_ATTACH,
.u.i = client.flags,
.len = sizeof(pkt.u.i),
};
client_send_packet(&pkt);
int status;
if (client_recv_packet(&pkt) && pkt.type == MSG_PID) {
if (server_set_socket_non_blocking(server.socket) == -1)
return false;
client_setup_terminal();
status = client_mainloop();
client_restore_terminal();
} else if (pkt.type == MSG_EXIT) {
status = pkt.u.i;
client_send_packet(&pkt);
close(server.socket);
}
if (status == -1) {
info("detached");
} else if (status == -EIO) {

7
client.c
View File

@ -63,13 +63,6 @@ static int client_mainloop(void) {
sigprocmask(SIG_BLOCK, &blockset, NULL);
client.need_resize = true;
Packet pkt = {
.type = MSG_ATTACH,
.u.i = client.flags,
.len = sizeof(pkt.u.i),
};
client_send_packet(&pkt);
while (server.running) {
fd_set fds;
FD_ZERO(&fds);

17
server.c
View File

@ -222,11 +222,26 @@ static void server_mainloop(void) {
case MSG_CONTENT:
server_write_pty(&client_packet);
break;
case MSG_ATTACH:
case MSG_ATTACH: {
Packet pkt;
if (!server.running && server.exit_status != -1) {
pkt = (Packet) {
.type = MSG_EXIT,
.u.i = server.exit_status,
.len = sizeof(pkt.u.i),
};
} else {
pkt = (Packet) {
.type = MSG_CONTENT,
.len = 0,
};
}
server_send_packet(c, &pkt);
c->flags = client_packet.u.i;
if (c->flags & CLIENT_LOWPRIORITY)
server_sink_client();
break;
}
case MSG_RESIZE:
c->state = STATE_ATTACHED;
if (!(c->flags & CLIENT_READONLY) && c == server.clients) {