client.c

@@ -108,6 +108,7 @@ 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;
@@ -162,7 +163,9 @@ 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;
 			}
 		}

server.c

@@ -112,29 +112,6 @@ static bool server_write_scrollback(Packet *pkt) {
 	return true;
 }
 
-static bool server_send_scrollback(Packet *pkt) {
-	print_packet("server-send-scrollback:", pkt);
-    ssize_t len, sblen;
-    uint32_t ii;
-    if (scrollback.wrap)
-        sblen = SCROLLBACK_SIZE;
-    else
-        sblen = scrollback.position-1;
-	pkt->type = MSG_CONTENT;
-    // Multiple packets need to be set possibly: need a double loop
-    for (ii=0;ii<len;ii++) {
-        pkt->u.msg[ii] = 1;
-    }
-	/* if (len > 0) */
-	/* 	pkt->len = len; */
-	/* else if (len == 0) */
-	/* 	server.running = false; */
-	/* else if (len == -1 && errno != EAGAIN && errno != EINTR && errno != EWOULDBLOCK) */
-	/* 	server.running = false; */
-    // 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);
@@ -253,9 +230,6 @@ 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) {

splex.c

@@ -63,8 +63,6 @@
 #define countof(arr) (sizeof(arr) / sizeof((arr)[0]))
 
 #define RV_DETACH -1
-#define PACKET_MSG_SIZE 4096-2*sizeof(uint32_t)
-#define SCROLLBACK_SIZE 1024
     
 char* splex_session_names = "0123456789";
 char* shell_cmd[2] = { "/bin/bash", NULL };
@@ -82,7 +80,7 @@ typedef struct {
 	uint32_t type;
 	uint32_t len;
 	union {
-		char msg[PACKET_MSG_SIZE];
+		char msg[4096 - 2*sizeof(uint32_t)];
 		struct {
 			uint16_t rows;
 			uint16_t cols;
@@ -127,6 +125,7 @@ typedef struct {
     char next_session[2];
 } Server;
 
+#define SCROLLBACK_SIZE 8192
 typedef struct {
     char buffer[SCROLLBACK_SIZE];
     uint32_t position;