forked from github/abduco
Compare commits
2 Commits
cc315c0987
...
d50a0e3d72
| Author | SHA1 | Date |
|---|---|---|
|
|
d50a0e3d72 | |
|
|
821fa0d5ce |
3
client.c
3
client.c
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
26
server.c
26
server.c
|
|
@ -112,6 +112,29 @@ static bool server_write_scrollback(Packet *pkt) {
|
||||||
return true;
|
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) {
|
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 +253,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) {
|
||||||
|
|
|
||||||
7
splex.c
7
splex.c
|
|
@ -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 SCROLLBACK_SIZE 1024
|
||||||
|
|
||||||
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,7 +127,6 @@ 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[SCROLLBACK_SIZE];
|
||||||
uint32_t position;
|
uint32_t position;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue