aljaz/ttyd
1
1
Fork 0
mirror of https://github.com/tsl0922/ttyd.git synced 2025-12-22 20:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

server: use libwebsockets's built-in ping-pong

Browse Source
This commit is contained in:
Shuanglei Tao
2018-01-11 22:15:49 +08:00
parent 2087fc6efe
commit 26f8b17891
5 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/protocol.c
View File

@@ -273,15 +273,14 @@ callback_tty(struct lws *wsi, enum lws_callback_reasons reason,
case LWS_CALLBACK_RECEIVE:
if (client->buffer == NULL) {
client->buffer = xmalloc(len + 1);
client->buffer = xmalloc(len);
client->len = len;
memcpy(client->buffer, in, len);
} else {
client->buffer = xrealloc(client->buffer, client->len + len + 1);
client->buffer = xrealloc(client->buffer, client->len + len);
memcpy(client->buffer + client->len, in, len);
client->len += len;
}
client->buffer[client->len] = '\0';
const char command = client->buffer[0];
@@ -302,24 +301,13 @@ callback_tty(struct lws *wsi, enum lws_callback_reasons reason,
break;
if (server->readonly)
return 0;
if (write(client->pty, client->buffer + 1, client->len - 1) < client->len - 1) {
lwsl_err("write INPUT to pty\n");
if (write(client->pty, client->buffer + 1, client->len - 1) == -1) {
lwsl_err("write INPUT to pty: %d (%s)\n", errno, strerror(errno));
tty_client_remove(client);
lws_close_reason(wsi, LWS_CLOSE_STATUS_UNEXPECTED_CONDITION, NULL, 0);
return -1;
}
break;
case PING:
{
unsigned char c = PONG;
if (lws_write(wsi, &c, 1, LWS_WRITE_BINARY) != 1) {
lwsl_err("send PONG\n");
tty_client_remove(client);
lws_close_reason(wsi, LWS_CLOSE_STATUS_UNEXPECTED_CONDITION, NULL, 0);
return -1;
}
}
break;
case RESIZE_TERMINAL:
if (parse_window_size(client->buffer + 1, &client->size) && client->pty > 0) {
if (ioctl(client->pty, TIOCSWINSZ, &client->size) == -1) {