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

protocol: set the pty file descriptor non blocking

Browse Source
This commit is contained in:
Shuanglei Tao
2019-04-21 10:22:37 +08:00
parent 14670ed9f5
commit 4cd6d480d6
1 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/protocol.c
View File

@@ -187,56 +187,55 @@ thread_run_command(void *args) {
int pty; int pty;
fd_set des_set; fd_set des_set;
pid_t pid = forkpty(&pty, NULL, NULL, NULL); pid_t pid = forkpty(&pty, NULL, NULL, NULL);
if (pid < 0) { /* error */
lwsl_err("forkpty failed: %d (%s)\n", errno, strerror(errno));
pthread_exit((void *) 1);
} else if (pid == 0) { /* child */
setenv("TERM", server->terminal_type, true);
// Don't pass the web socket onto child processes
close(lws_get_socket_fd(client->wsi));
if (execvp(argv[0], argv) < 0) {
perror("execvp failed\n");
_exit(-errno);
}
}
switch (pid) { // set the pty file descriptor non blocking
case -1: /* error */ int status_flags = fcntl(pty, F_GETFL);
lwsl_err("forkpty, error: %d (%s)\n", errno, strerror(errno)); if (status_flags != -1) {
break; fcntl(pty, F_SETFL, status_flags | O_NONBLOCK);
case 0: /* child */ }
if (setenv("TERM", server->terminal_type, true) < 0) {
perror("setenv");
pthread_exit((void *) 1);
}
// Don't pass the web socket onto child processes
close(lws_get_socket_fd(client->wsi));
if (execvp(argv[0], argv) < 0) {
perror("execvp");
pthread_exit((void *) 1);
}
break;
default: /* parent */
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);
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);
while (client->running) {
FD_ZERO (&des_set);
FD_SET (pty, &des_set);
struct timeval tv = { 1, 0 };
int ret = select(pty + 1, &des_set, NULL, NULL, &tv);
if (ret == 0) continue;
if (ret < 0) break;
if (FD_ISSET (pty, &des_set)) {
while (client->running) { while (client->running) {
FD_ZERO (&des_set); pthread_mutex_lock(&client->mutex);
FD_SET (pty, &des_set); while (client->state == STATE_READY) {
struct timeval tv = { 1, 0 }; pthread_cond_wait(&client->cond, &client->mutex);
int ret = select(pty + 1, &des_set, NULL, NULL, &tv);
if (ret == 0) continue;
if (ret < 0) break;
if (FD_ISSET (pty, &des_set)) {
while (client->running) {
pthread_mutex_lock(&client->mutex);
while (client->state == STATE_READY) {
pthread_cond_wait(&client->cond, &client->mutex);
}
memset(client->pty_buffer, 0, sizeof(client->pty_buffer));
client->pty_len = read(pty, client->pty_buffer + LWS_PRE + 1, BUF_SIZE);
client->state = STATE_READY;
pthread_mutex_unlock(&client->mutex);
break;
}
} }
memset(client->pty_buffer, 0, sizeof(client->pty_buffer));
if (client->pty_len <= 0) break; client->pty_len = read(pty, client->pty_buffer + LWS_PRE + 1, BUF_SIZE);
client->state = STATE_READY;
pthread_mutex_unlock(&client->mutex);
break;
} }
break; }
if (client->pty_len <= 0) break;
} }
pthread_exit((void *) 0); pthread_exit((void *) 0);