diff --git a/client.c b/client.c index 6ef0a18..bdecc01 100644 --- a/client.c +++ b/client.c @@ -108,7 +108,6 @@ static int client_mainloop(void) { client.need_resize = true; break; case MSG_EXIT: - info("MSG_EXIT from server.socket\n"); client_send_packet(&pkt); close(server.socket); return pkt.u.i; @@ -163,9 +162,7 @@ static int client_mainloop(void) { } } else if (len == 0) { debug("client-stdin: EOF\n"); - info("EOF from stdin\n"); server.next_session[0] = '\0'; - /* close(server.socket); */ return 0; } } diff --git a/server.c b/server.c index 53cb9b2..9d1028f 100644 --- a/server.c +++ b/server.c @@ -104,7 +104,7 @@ static bool server_write_scrollback(Packet *pkt) { uint32_t ii; for (ii=0;iiu.msg[ii]; - if (scrollback.position>SCROLLBACK_SIZE) { + if (scrollback.position>PACKET_MSG_SIZE) { scrollback.position = 0; scrollback.wrap = true; } @@ -112,6 +112,12 @@ static bool server_write_scrollback(Packet *pkt) { return true; } +static bool server_send_scrollback(Packet *pkt) { + print_packet("server-send-scrollback:", pkt); + // double loop to message size + return true; +} + static bool server_recv_packet(Client *c, Packet *pkt) { if (recv_packet(c->socket, pkt)) { print_packet("server-recv:", pkt); @@ -230,6 +236,9 @@ static void server_mainloop(void) { if (FD_ISSET(server.pty, &readfds)) pty_data = server_read_pty(&server_packet); + if (pty_data) + server_write_scrollback(&server_packet); + for (Client **prev_next = &server.clients, *c = server.clients; c;) { if (FD_ISSET(c->socket, &readfds) && server_recv_packet(c, &client_packet)) { switch (client_packet.type) { diff --git a/splex.c b/splex.c index 5980d6b..9b32db6 100644 --- a/splex.c +++ b/splex.c @@ -63,7 +63,9 @@ #define countof(arr) (sizeof(arr) / sizeof((arr)[0])) #define RV_DETACH -1 - +/* #define PACKET_MSG_SIZE 4096-2*sizeof(uint32_t) */ +#define PACKET_MSG_SIZE 8192-2*sizeof(uint32_t) + char* splex_session_names = "0123456789"; char* shell_cmd[2] = { "/bin/bash", NULL }; @@ -80,7 +82,7 @@ typedef struct { uint32_t type; uint32_t len; union { - char msg[4096 - 2*sizeof(uint32_t)]; + char msg[PACKET_MSG_SIZE]; struct { uint16_t rows; uint16_t cols; @@ -125,9 +127,8 @@ typedef struct { char next_session[2]; } Server; -#define SCROLLBACK_SIZE 8192 typedef struct { - char buffer[SCROLLBACK_SIZE]; + char buffer[PACKET_MSG_SIZE]; uint32_t position; bool wrap; } Scrollback;