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

Print more details about errors

Browse Source
This commit is contained in:
Shuanglei Tao
2017-02-23 19:57:17 +08:00
parent 2c34c5230b
commit 0a057b22c3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/protocol.c
View File

@@ -36,12 +36,12 @@ parse_window_size(const char *json, struct winsize *size) {
struct json_object *o = NULL; struct json_object *o = NULL;
if (!json_object_object_get_ex(obj, "columns", &o)) { if (!json_object_object_get_ex(obj, "columns", &o)) {
lwsl_err("columns field not exists!\n"); lwsl_err("columns field not exists, json: %s\n", json);
return false; return false;
} }
columns = json_object_get_int(o); columns = json_object_get_int(o);
if (!json_object_object_get_ex(obj, "rows", &o)) { if (!json_object_object_get_ex(obj, "rows", &o)) {
lwsl_err("rows field not exists!\n"); lwsl_err("rows field not exists, json: %s\n", json);
return false; return false;
} }
rows = json_object_get_int(o); rows = json_object_get_int(o);
@@ -118,7 +118,7 @@ thread_run_command(void *args) {
switch (pid) { switch (pid) {
case -1: /* error */ case -1: /* error */
lwsl_err("forkpty\n"); lwsl_err("forkpty, error: %d (%s)\n", errno, strerror(errno));
break; break;
case 0: /* child */ case 0: /* child */
if (setenv("TERM", "xterm-256color", true) < 0) { if (setenv("TERM", "xterm-256color", true) < 0) {
@@ -235,7 +235,7 @@ callback_tty(struct lws *wsi, enum lws_callback_reasons reason,
free(b64_text); free(b64_text);
if (lws_write(wsi, p, n, LWS_WRITE_TEXT) < n) { if (lws_write(wsi, p, n, LWS_WRITE_TEXT) < n) {
lwsl_err("lws_write\n"); lwsl_err("write data to WS\n");
break; break;
} }
@@ -318,8 +318,9 @@ callback_tty(struct lws *wsi, enum lws_callback_reasons reason,
} }
client->authenticated = true; client->authenticated = true;
} }
if (pthread_create(&client->thread, NULL, thread_run_command, client) != 0) { int err = pthread_create(&client->thread, NULL, thread_run_command, client);
lwsl_err("pthread_create\n"); if (err != 0) {
lwsl_err("pthread_create return: %d\n", err);
return 1; return 1;
} }
break; break;