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

bugfix: next_session did not work correctly. Can switch between sessions on exit now

This commit is contained in:
Michael Krayer 2023-10-12 10:16:36 +02:00
parent d9c18f680a
commit ec4b1eb4f4
2 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
client.c
View File

@ -107,6 +107,7 @@ static int client_mainloop(void) {
client.need_resize = true; client.need_resize = true;
break; break;
case MSG_EXIT: case MSG_EXIT:
info("MSG_EXIT from server.socket\n");
client_send_packet(&pkt); client_send_packet(&pkt);
close(server.socket); close(server.socket);
return pkt.u.i; return pkt.u.i;
@ -126,47 +127,20 @@ static int client_mainloop(void) {
bool detach = false; bool detach = false;
switch (pkt.u.msg[0]) { switch (pkt.u.msg[0]) {
case 'd': case 'd':
server.next_session = "\0"; server.next_session[0] = '\0';
detach = true; detach = true;
break; break;
case '0': case '0':
server.next_session = "0";
detach = true;
break;
case '1': case '1':
server.next_session = "1";
detach = true;
break;
case '2': case '2':
server.next_session = "2";
detach = true;
break;
case '3': case '3':
server.next_session = "3";
detach = true;
break;
case '4': case '4':
server.next_session = "4";
detach = true;
break;
case '5': case '5':
server.next_session = "5";
detach = true;
break;
case '6': case '6':
server.next_session = "6";
detach = true;
break;
case '7': case '7':
server.next_session = "7";
detach = true;
break;
case '8': case '8':
server.next_session = "8";
detach = true;
break;
case '9': case '9':
server.next_session = "9"; server.next_session[0] = pkt.u.msg[0];
detach = true; detach = true;
break; break;
} }
@ -188,8 +162,10 @@ static int client_mainloop(void) {
} }
} else if (len == 0) { } else if (len == 0) {
debug("client-stdin: EOF\n"); debug("client-stdin: EOF\n");
server.next_session = "\0"; info("EOF from stdin\n");
return RV_DETACH; server.next_session[0] = '\0';
/* close(server.socket); */
return 0;
} }
} }
} }

26
splex.c
View File

@ -122,10 +122,10 @@ typedef struct {
const char *session_name; const char *session_name;
char host[255]; char host[255];
bool read_pty; bool read_pty;
const char *next_session; char next_session[2];
} Server; } Server;
static Server server = { .running = true, .exit_status = -1, .host = "@localhost" }; static Server server = { .running = true, .exit_status = -1, .host = "@localhost" , .next_session = { '\0', '\0' } };
static Client client; static Client client;
static struct termios orig_term, cur_term; static struct termios orig_term, cur_term;
static bool has_term, alternate_buffer, quiet; static bool has_term, alternate_buffer, quiet;
@ -564,28 +564,37 @@ static bool set_next_session() {
info("*siter %c\n",*siter); info("*siter %c\n",*siter);
if (*siter == '\0') if (*siter == '\0')
return false; return false;
server.next_session = sname; server.next_session[0] = *siter;
return true; return true;
} }
static bool session_loop() { static bool session_loop() {
// Set initial session, or create a new one // Set initial session, or create a new one
if (!set_next_session()) { if (!set_next_session()) {
server.next_session = "0"; server.next_session[0] = '0';
} }
// printf("%s\n",server.session_name); // printf("%s\n",server.session_name);
while (true) { while (true) {
info("Iteration with session %s\n",server.next_session);
server.session_name = server.next_session; server.session_name = server.next_session;
if (!session_alive(server.session_name)) info("Iteration with session %s\n",server.next_session);
if (!session_alive(server.session_name)) {
info("Session not alive: %s",server.session_name);
if (!create_session(server.session_name, shell_cmd)) if (!create_session(server.session_name, shell_cmd))
die("create-session"); die("create-session");
} else {
info("Session alive: %s",server.session_name);
}
server.session_name = server.next_session;
info("server.socket > 0\n");
if (server.socket > 0) if (server.socket > 0)
close(server.socket); close(server.socket);
info("session_connect successful?\n");
if ((server.socket = session_connect(server.session_name)) == -1) if ((server.socket = session_connect(server.session_name)) == -1)
return false; return false;
info("session_set_socket_non_blocking successful?\n");
if (server_set_socket_non_blocking(server.socket) == -1) if (server_set_socket_non_blocking(server.socket) == -1)
return false; return false;
info("Passed all initial checks.\n");
struct sigaction sa; struct sigaction sa;
sa.sa_flags = 0; sa.sa_flags = 0;
@ -609,9 +618,12 @@ static bool session_loop() {
} }
} else { } else {
info("session terminated with exit status %d", status); info("session terminated with exit status %d", status);
if (!set_next_session()) if (!set_next_session()){
info("could not set next session");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
info("set next session to %s",server.next_session);
}
} }
} }