forked from github/abduco
Compare commits
No commits in common. "cc315c098701e7ac1e189573e7c7a2f061426ad7" and "9558c61a747e21adcde8e55fb88478c70659d44e" have entirely different histories.
cc315c0987
...
9558c61a74
14
server.c
14
server.c
|
|
@ -98,20 +98,6 @@ static bool server_write_pty(Packet *pkt) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool server_write_scrollback(Packet *pkt) {
|
|
||||||
print_packet("server-write-scrollback:", pkt);
|
|
||||||
size_t size = pkt->len;
|
|
||||||
uint32_t ii;
|
|
||||||
for (ii=0;ii<size;ii++) {
|
|
||||||
scrollback.buffer[scrollback.position++] = pkt->u.msg[ii];
|
|
||||||
if (scrollback.position>SCROLLBACK_SIZE) {
|
|
||||||
scrollback.position = 0;
|
|
||||||
scrollback.wrap = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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);
|
||||||
|
|
|
||||||
10
splex.c
10
splex.c
|
|
@ -125,16 +125,8 @@ typedef struct {
|
||||||
char next_session[2];
|
char next_session[2];
|
||||||
} Server;
|
} Server;
|
||||||
|
|
||||||
#define SCROLLBACK_SIZE 8192
|
|
||||||
typedef struct {
|
|
||||||
char buffer[SCROLLBACK_SIZE];
|
|
||||||
uint32_t position;
|
|
||||||
bool wrap;
|
|
||||||
} Scrollback;
|
|
||||||
|
|
||||||
static Server server = { .running = true, .exit_status = -1, .host = "@localhost" , .next_session = { '\0', '\0' } };
|
static Server server = { .running = true, .exit_status = -1, .host = "@localhost" , .next_session = { '\0', '\0' } };
|
||||||
static Client client;
|
static Client client;
|
||||||
static Scrollback scrollback = { .buffer = {}, .position = 0, .wrap = false };
|
|
||||||
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;
|
||||||
|
|
||||||
|
|
@ -627,8 +619,10 @@ 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue