v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Report failed commands to slave

Browse Source 
which will in turn notify the proper client
This commit is contained in:
Nicolas Viennot 2013-06-12 20:09:43 -04:00
parent 844451c6ce
commit e52312ec3c
4 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd-queue.c
View File

@ -137,7 +137,14 @@ cmdq_error(struct cmd_q *cmdq, const char *fmt, ...)
va_end(ap); va_end(ap);
if (c == NULL) { if (c == NULL) {
#ifdef TMATE
if (cmd->file && cmd->line)
xasprintf(&cause, "%s:%u: %s", cmd->file, cmd->line, msg);
else
xasprintf(&cause, "%s", msg);
#else
xasprintf(&cause, "%s:%u: %s", cmd->file, cmd->line, msg); xasprintf(&cause, "%s:%u: %s", cmd->file, cmd->line, msg);
#endif
ARRAY_ADD(&cfg_causes, cause); ARRAY_ADD(&cfg_causes, cause);
} else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) { } else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
evbuffer_add(c->stderr_data, msg, msglen); evbuffer_add(c->stderr_data, msg, msglen);
@ -228,7 +235,7 @@ cmdq_continue(struct cmd_q *cmdq)
#ifdef TMATE #ifdef TMATE
if (tmate_should_replicate_cmd(cmdq->cmd->entry)) if (tmate_should_replicate_cmd(cmdq->cmd->entry))
tmate_cmd(s); tmate_exec_cmd(s);
#endif #endif
guard = cmdq_guard(cmdq, "begin"); guard = cmdq_guard(cmdq, "begin");

21
tmate-decoder.c
View File

@ -115,23 +115,36 @@ static void tmate_client_resize(struct tmate_unpacker *uk)
/* TODO Handle reconnection cases */ /* TODO Handle reconnection cases */
} }
static void tmate_client_cmd(struct tmate_unpacker *uk) static void tmate_client_exec_cmd(struct tmate_unpacker *uk)
{ {
struct cmd_q *cmd_q; struct cmd_q *cmd_q;
struct cmd_list *cmdlist; struct cmd_list *cmdlist;
char *cmd_str;
char *cause; char *cause;
cmd_str = unpack_string(uk); int client_id = unpack_int(uk);
char *cmd_str = unpack_string(uk);
if (cmd_string_parse(cmd_str, &cmdlist, NULL, 0, &cause) != 0) { if (cmd_string_parse(cmd_str, &cmdlist, NULL, 0, &cause) != 0) {
tmate_failed_cmd(client_id, cause);
free(cause); free(cause);
goto out; goto out;
} }
/* error messages land in cfg_causes */
ARRAY_FREE(&cfg_causes);
cmd_q = cmdq_new(NULL); cmd_q = cmdq_new(NULL);
cmdq_run(cmd_q, cmdlist); cmdq_run(cmd_q, cmdlist);
cmd_list_free(cmdlist); cmd_list_free(cmdlist);
cmdq_free(cmd_q); cmdq_free(cmd_q);
if (!ARRAY_EMPTY(&cfg_causes)) {
cause = ARRAY_ITEM(&cfg_causes, 0);
tmate_failed_cmd(client_id, cause);
free(cause);
ARRAY_FREE(&cfg_causes);
}
out: out:
free(cmd_str); free(cmd_str);
} }
@ -148,7 +161,7 @@ static void handle_message(msgpack_object obj)
case TMATE_REPLY_HEADER: tmate_reply_header(uk); break; case TMATE_REPLY_HEADER: tmate_reply_header(uk); break;
case TMATE_CLIENT_PANE_KEY: tmate_client_pane_key(uk); break; case TMATE_CLIENT_PANE_KEY: tmate_client_pane_key(uk); break;
case TMATE_CLIENT_RESIZE: tmate_client_resize(uk); break; case TMATE_CLIENT_RESIZE: tmate_client_resize(uk); break;
case TMATE_CLIENT_CMD: tmate_client_cmd(uk); break; case TMATE_CLIENT_EXEC_CMD: tmate_client_exec_cmd(uk); break;
default: decoder_error(); default: decoder_error();
} }
} }

12
tmate-encoder.c
View File

@ -147,13 +147,21 @@ int tmate_should_replicate_cmd(const struct cmd_entry *cmd)
return 0; return 0;
} }
void tmate_cmd(const char *cmd) void tmate_exec_cmd(const char *cmd)
{ {
pack(array, 2); pack(array, 2);
pack(int, TMATE_CMD); pack(int, TMATE_EXEC_CMD);
pack(string, cmd); pack(string, cmd);
} }
void tmate_failed_cmd(int client_id, const char *cause)
{
pack(array, 3);
pack(int, TMATE_FAILED_CMD);
pack(int, client_id);
pack(string, cause);
}
void tmate_status(const char *left, const char *right) void tmate_status(const char *left, const char *right)
{ {
static char *old_left, *old_right; static char *old_left, *old_right;

8
tmate.h
View File

@ -22,7 +22,8 @@ enum tmate_commands {
TMATE_HEADER, TMATE_HEADER,
TMATE_SYNC_LAYOUT, TMATE_SYNC_LAYOUT,
TMATE_PTY_DATA, TMATE_PTY_DATA,
TMATE_CMD, TMATE_EXEC_CMD,
TMATE_FAILED_CMD,
TMATE_STATUS, TMATE_STATUS,
}; };
@ -38,7 +39,8 @@ extern void tmate_write_header(void);
extern void tmate_sync_layout(void); extern void tmate_sync_layout(void);
extern void tmate_pty_data(struct window_pane *wp, const char *buf, size_t len); extern void tmate_pty_data(struct window_pane *wp, const char *buf, size_t len);
extern int tmate_should_replicate_cmd(const struct cmd_entry *cmd); extern int tmate_should_replicate_cmd(const struct cmd_entry *cmd);
extern void tmate_cmd(const char *cmd); extern void tmate_exec_cmd(const char *cmd);
extern void tmate_failed_cmd(int client_id, const char *cause);
extern void tmate_status(const char *left, const char *right); extern void tmate_status(const char *left, const char *right);
/* tmate-decoder.c */ /* tmate-decoder.c */
@ -47,7 +49,7 @@ enum tmate_client_commands {
TMATE_REPLY_HEADER, TMATE_REPLY_HEADER,
TMATE_CLIENT_PANE_KEY, TMATE_CLIENT_PANE_KEY,
TMATE_CLIENT_RESIZE, TMATE_CLIENT_RESIZE,
TMATE_CLIENT_CMD, TMATE_CLIENT_EXEC_CMD,
}; };
struct tmate_decoder { struct tmate_decoder {