X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Ftelnet_server.c;h=e2f0e019cc591318603ba1636dda4592360e7260;hp=af49050a912aa7c3a398e7f9c4c206dbce44fb3b;hb=67e0aea25850b8286f750e6458e5de741e6cb3b5;hpb=2a0317e6f40a4f2d5d20ccdaae82100f0ad4340a diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index af49050a91..e2f0e019cc 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -50,57 +50,89 @@ static char *negotiate = #define CTRL(c) (c - '@') -void telnet_prompt(connection_t *connection) +/* The only way we can detect that the socket is closed is the first time + * we write to it, we will fail. Subsequent write operations will + * succeed. Shudder! + */ +int telnet_write(connection_t *connection, const void *data, int len) { telnet_connection_t *t_con = connection->priv; + if (t_con->closed) + return ERROR_SERVER_REMOTE_CLOSED; - write_socket(connection->fd, t_con->prompt, strlen(t_con->prompt)); + if (write_socket(connection->fd, data, len) == len) + { + return ERROR_OK; + } + t_con->closed = 1; + return ERROR_SERVER_REMOTE_CLOSED; } -int telnet_outputline(connection_t *connection, char* line) +int telnet_prompt(connection_t *connection) { - write_socket(connection->fd, line, strlen(line)); - return write_socket(connection->fd, "\r\n\0", 3); + telnet_connection_t *t_con = connection->priv; + + return telnet_write(connection, t_con->prompt, strlen(t_con->prompt)); } -int telnet_output(struct command_context_s *cmd_ctx, char* line) +int telnet_outputline(connection_t *connection, const char *line) { - connection_t *connection = cmd_ctx->output_handler_priv; + int len; - write_socket(connection->fd, line, strlen(line)); - write_socket(connection->fd, "\r\n\0", 3); + /* process lines in buffer */ + while (*line) { + char *line_end = strchr(line, '\n'); + + if (line_end) + len = line_end-line; + else + len = strlen(line); + + telnet_write(connection, line, len); + if (line_end) + { + telnet_write(connection, "\r\n\0", 3); + line += len+1; + } + else + { + line += len; + } + } return ERROR_OK; } -void telnet_log_callback(void *privData, const char *file, int line, - const char *function, const char *format, va_list args) +int telnet_output(struct command_context_s *cmd_ctx, char* line) { - connection_t *connection=(connection_t *)privData; - char *t=allocPrintf(format, args); - if (t==NULL) - return; - - telnet_outputline(connection, t); + connection_t *connection = cmd_ctx->output_handler_priv; - free(t); + return telnet_outputline(connection, line); +} + +void telnet_log_callback(void *priv, const char *file, int line, + const char *function, const char *string) +{ + connection_t *connection = priv; + telnet_outputline(connection, string); } int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv) { struct command_context_s *cmd_ctx = priv; - char buffer[512]; + connection_t *connection = cmd_ctx->output_handler_priv; + telnet_connection_t *t_con = connection->priv; switch (event) { case TARGET_EVENT_HALTED: - command_print(cmd_ctx, "Target %i halted", get_num_by_target(target)); - target->type->arch_state(target, buffer, 512); - buffer[511] = 0; - command_print(cmd_ctx, "%s", buffer); + target_arch_state(target); + if (!t_con->suppress_prompt) + telnet_prompt(connection); break; case TARGET_EVENT_RESUMED: - command_print(cmd_ctx, "Target %i resumed", get_num_by_target(target)); + if (!t_con->suppress_prompt) + telnet_prompt(connection); break; default: break; @@ -118,23 +150,25 @@ int telnet_new_connection(connection_t *connection) connection->priv = telnet_connection; /* initialize telnet connection information */ + telnet_connection->closed = 0; telnet_connection->line_size = 0; telnet_connection->line_cursor = 0; telnet_connection->option_size = 0; telnet_connection->prompt = strdup("> "); + telnet_connection->suppress_prompt = 0; telnet_connection->state = TELNET_STATE_DATA; /* output goes through telnet connection */ command_set_output_handler(connection->cmd_ctx, telnet_output, connection); /* negotiate telnet options */ - write_socket(connection->fd, negotiate, strlen(negotiate)); + telnet_write(connection, negotiate, strlen(negotiate)); /* print connection banner */ if (telnet_service->banner) { - write_socket(connection->fd, telnet_service->banner, strlen(telnet_service->banner)); - write_socket(connection->fd, "\r\n\0", 3); + telnet_write(connection, telnet_service->banner, strlen(telnet_service->banner)); + telnet_write(connection, "\r\n\0", 3); } telnet_prompt(connection); @@ -146,7 +180,7 @@ int telnet_new_connection(connection_t *connection) } telnet_connection->next_history = 0; telnet_connection->current_history = 0; - + target_register_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx); return ERROR_OK; @@ -157,13 +191,13 @@ void telnet_clear_line(connection_t *connection, telnet_connection_t *t_con) /* move to end of line */ if (t_con->line_cursor < t_con->line_size) { - write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); + telnet_write(connection, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); } /* backspace, overwrite with space, backspace */ while (t_con->line_size > 0) { - write_socket(connection->fd, "\b \b", 3); + telnet_write(connection, "\b \b", 3); t_con->line_size--; } t_con->line_cursor = 0; @@ -201,7 +235,7 @@ int telnet_input(connection_t *connection) { if (isprint(*buf_p)) /* printable character */ { - write_socket(connection->fd, buf_p, 1); + telnet_write(connection, buf_p, 1); if (t_con->line_cursor == t_con->line_size) { t_con->line[t_con->line_size++] = *buf_p; @@ -213,10 +247,10 @@ int telnet_input(connection_t *connection) memmove(t_con->line + t_con->line_cursor + 1, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); t_con->line[t_con->line_cursor++] = *buf_p; t_con->line_size++; - write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); + telnet_write(connection, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); for (i = t_con->line_cursor; i < t_con->line_size; i++) { - write_socket(connection->fd, "\b", 1); + telnet_write(connection, "\b", 1); } } } @@ -244,7 +278,7 @@ int telnet_input(connection_t *connection) } t_con->line[t_con->line_size] = 0; - write_socket(connection->fd, "\r\n\x00", 3); + telnet_write(connection, "\r\n\x00", 3); if (strcmp(t_con->line, "history") == 0) { @@ -253,8 +287,8 @@ int telnet_input(connection_t *connection) { if (t_con->history[i]) { - write_socket(connection->fd, t_con->history[i], strlen(t_con->history[i])); - write_socket(connection->fd, "\r\n\x00", 3); + telnet_write(connection, t_con->history[i], strlen(t_con->history[i])); + telnet_write(connection, "\r\n\x00", 3); } } telnet_prompt(connection); @@ -263,18 +297,19 @@ int telnet_input(connection_t *connection) continue; } + log_add_callback(telnet_log_callback, connection); + t_con->suppress_prompt = 1; + retval = command_run_line(command_context, t_con->line); - log_setCallback(telnet_log_callback, connection); - - if ((retval = command_run_line(command_context, t_con->line)) != ERROR_OK) + log_remove_callback(telnet_log_callback, connection); + t_con->suppress_prompt = 0; + + if (retval == ERROR_COMMAND_CLOSE_CONNECTION) { - if (retval == ERROR_COMMAND_CLOSE_CONNECTION) - { - return ERROR_SERVER_REMOTE_CLOSED; - } + return ERROR_SERVER_REMOTE_CLOSED; } - + /* Save only non-blank lines in the history */ if (t_con->line_size > 0) { @@ -300,8 +335,9 @@ int telnet_input(connection_t *connection) t_con->history[t_con->current_history] = strdup(""); } - /* output prompt after command */ - telnet_prompt(connection); + int t = telnet_prompt(connection); + if (t == ERROR_SERVER_REMOTE_CLOSED) + return t; t_con->line_size = 0; t_con->line_cursor = 0; @@ -313,16 +349,16 @@ int telnet_input(connection_t *connection) if (t_con->line_cursor != t_con->line_size) { int i; - write_socket(connection->fd, "\b", 1); + telnet_write(connection, "\b", 1); t_con->line_cursor--; t_con->line_size--; memmove(t_con->line + t_con->line_cursor, t_con->line + t_con->line_cursor + 1, t_con->line_size - t_con->line_cursor); - write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); - write_socket(connection->fd, " \b", 2); + telnet_write(connection, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); + telnet_write(connection, " \b", 2); for (i = t_con->line_cursor; i < t_con->line_size; i++) { - write_socket(connection->fd, "\b", 1); + telnet_write(connection, "\b", 1); } } else @@ -330,7 +366,7 @@ int telnet_input(connection_t *connection) t_con->line_size--; t_con->line_cursor--; /* back space: move the 'printer' head one char back, overwrite with space, move back again */ - write_socket(connection->fd, "\b \b", 3); + telnet_write(connection, "\b \b", 3); } } } @@ -342,7 +378,7 @@ int telnet_input(connection_t *connection) { if (t_con->line_cursor > 0) { - write_socket(connection->fd, "\b", 1); + telnet_write(connection, "\b", 1); t_con->line_cursor--; } t_con->state = TELNET_STATE_DATA; @@ -351,7 +387,7 @@ int telnet_input(connection_t *connection) { if (t_con->line_cursor < t_con->line_size) { - write_socket(connection->fd, t_con->line + t_con->line_cursor++, 1); + telnet_write(connection, t_con->line + t_con->line_cursor++, 1); } t_con->state = TELNET_STATE_DATA; } @@ -396,7 +432,7 @@ int telnet_input(connection_t *connection) { if (t_con->line_cursor > 0) { - write_socket(connection->fd, "\b", 1); + telnet_write(connection, "\b", 1); t_con->line_cursor--; } t_con->state = TELNET_STATE_DATA; @@ -405,7 +441,7 @@ int telnet_input(connection_t *connection) { if (t_con->line_cursor < t_con->line_size) { - write_socket(connection->fd, t_con->line + t_con->line_cursor++, 1); + telnet_write(connection, t_con->line + t_con->line_cursor++, 1); } t_con->state = TELNET_STATE_DATA; } @@ -418,7 +454,7 @@ int telnet_input(connection_t *connection) t_con->line_size = strlen(t_con->history[last_history]); t_con->line_cursor = t_con->line_size; memcpy(t_con->line, t_con->history[last_history], t_con->line_size + 1); - write_socket(connection->fd, t_con->line, t_con->line_size); + telnet_write(connection, t_con->line, t_con->line_size); t_con->current_history = last_history; } t_con->state = TELNET_STATE_DATA; @@ -432,7 +468,7 @@ int telnet_input(connection_t *connection) t_con->line_size = strlen(t_con->history[next_history]); t_con->line_cursor = t_con->line_size; memcpy(t_con->line, t_con->history[next_history], t_con->line_size + 1); - write_socket(connection->fd, t_con->line, t_con->line_size); + telnet_write(connection, t_con->line, t_con->line_size); t_con->current_history = next_history; } t_con->state = TELNET_STATE_DATA; @@ -459,14 +495,14 @@ int telnet_input(connection_t *connection) memmove(t_con->line + t_con->line_cursor, t_con->line + t_con->line_cursor + 1, t_con->line_size - t_con->line_cursor); /* print remainder of buffer */ - write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); + telnet_write(connection, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); /* overwrite last char with whitespace */ - write_socket(connection->fd, " \b", 2); + telnet_write(connection, " \b", 2); /* move back to cursor position*/ for (i = t_con->line_cursor; i < t_con->line_size; i++) { - write_socket(connection->fd, "\b", 1); + telnet_write(connection, "\b", 1); } }