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

packet message size can be changed at will; only actual data is sent; match it to scrollback size

This commit is contained in:
Michael Krayer 2023-10-13 10:35:02 +02:00
parent cc315c0987
commit 821fa0d5ce
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client.c
View File

@ -108,7 +108,6 @@ 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;
@ -163,9 +162,7 @@ static int client_mainloop(void) {
} }
} else if (len == 0) { } else if (len == 0) {
debug("client-stdin: EOF\n"); debug("client-stdin: EOF\n");
info("EOF from stdin\n");
server.next_session[0] = '\0'; server.next_session[0] = '\0';
/* close(server.socket); */
return 0; return 0;
} }
} }

11
server.c
View File

@ -104,7 +104,7 @@ static bool server_write_scrollback(Packet *pkt) {
uint32_t ii; uint32_t ii;
for (ii=0;ii<size;ii++) { for (ii=0;ii<size;ii++) {
scrollback.buffer[scrollback.position++] = pkt->u.msg[ii]; scrollback.buffer[scrollback.position++] = pkt->u.msg[ii];
if (scrollback.position>SCROLLBACK_SIZE) { if (scrollback.position>PACKET_MSG_SIZE) {
scrollback.position = 0; scrollback.position = 0;
scrollback.wrap = true; scrollback.wrap = true;
} }
@ -112,6 +112,12 @@ static bool server_write_scrollback(Packet *pkt) {
return true; 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) { static bool server_recv_packet(Client *c, Packet *pkt) {
if (recv_packet(c->socket, pkt)) { if (recv_packet(c->socket, pkt)) {
print_packet("server-recv:", pkt); print_packet("server-recv:", pkt);
@ -230,6 +236,9 @@ static void server_mainloop(void) {
if (FD_ISSET(server.pty, &readfds)) if (FD_ISSET(server.pty, &readfds))
pty_data = server_read_pty(&server_packet); 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;) { for (Client **prev_next = &server.clients, *c = server.clients; c;) {
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) {

9
splex.c
View File

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