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: remove sys/queue dep

Browse Source
This commit is contained in:
Shuanglei Tao
2019-11-30 16:17:04 +08:00
parent 59601329ae
commit fe7bad2c63
3 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/protocol.c
View File

@@ -6,7 +6,6 @@
#include <fcntl.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
#if defined(__OpenBSD__) || defined(__APPLE__)
#include <util.h>
@@ -106,42 +105,25 @@ check_host_origin(struct lws *wsi) {
return len > 0 && strcasecmp(buf, host_buf) == 0;
}
void
tty_client_remove(struct tty_client *client) {
struct tty_client *iterator;
LIST_FOREACH(iterator, &server->clients, list) {
if (iterator == client) {
LIST_REMOVE(iterator, list);
server->client_count--;
break;
}
}
}
void
tty_client_destroy(struct tty_client *client) {
if (!client->running || client->pid <= 0)
if (client->pid <= 0)
goto cleanup;
client->running = false;
// kill process (group) and free resource
int pgid = getpgid(client->pid);
int pid = pgid > 0 ? -pgid : client->pid;
lwsl_notice("sending %s (%d) to process (group) %d\n", server->sig_name, server->sig_code, pid);
if (kill(pid, server->sig_code) != 0) {
if (errno == ESRCH)
goto cleanup;
lwsl_err("kill: %d, errno: %d (%s)\n", pid, errno, strerror(errno));
}
pid_t pid_out;
client->exit_status = wait_proc(client->pid, &pid_out);
if (pid_out > 0) {
lwsl_notice("process exited with code %d, pid: %d\n", client->exit_status, pid_out);
}
close(client->pty);
cleanup:
uv_read_stop((uv_stream_t *) &client->pipe);
close(client->pty);
// free the buffer
if (client->buffer != NULL)
free(client->buffer);
@@ -151,9 +133,6 @@ cleanup:
for (int i = 0; i < client->argc; i++) {
free(client->args[i]);
}
// remove from client list
tty_client_remove(client);
}
void
@@ -224,7 +203,6 @@ spawn_process(struct tty_client *client) {
lwsl_notice("started process, pid: %d\n", pid);
client->pid = pid;
client->pty = pty;
client->running = true;
if (client->size.ws_row > 0 && client->size.ws_col > 0)
ioctl(client->pty, TIOCSWINSZ, &client->size);
@@ -265,7 +243,6 @@ callback_tty(struct lws *wsi, enum lws_callback_reasons reason,
break;
case LWS_CALLBACK_ESTABLISHED:
client->running = false;
client->initialized = false;
client->initial_cmd_index = 0;
client->authenticated = false;
@@ -286,7 +263,6 @@ callback_tty(struct lws *wsi, enum lws_callback_reasons reason,
}
}
LIST_INSERT_HEAD(&server->clients, client, list);
server->client_count++;
lws_hdr_copy(wsi, buf, sizeof(buf), WSI_TOKEN_GET_URI);
@@ -416,6 +392,7 @@ callback_tty(struct lws *wsi, enum lws_callback_reasons reason,
break;
case LWS_CALLBACK_CLOSED:
server->client_count--;
lwsl_notice("WS closed from %s, clients: %d\n", client->address, server->client_count);
tty_client_destroy(client);
if (server->once && server->client_count == 0) {