#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_output(struct command_context_s *cmd_ctx, char* line)
+int telnet_prompt(connection_t *connection)
{
- connection_t *connection = cmd_ctx->output_handler_priv;
+ telnet_connection_t *t_con = connection->priv;
+
+ return telnet_write(connection, t_con->prompt, strlen(t_con->prompt));
+}
+
+int telnet_outputline(connection_t *connection, const char *line)
+{
+ 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;
}
-int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
+int telnet_output(struct command_context_s *cmd_ctx, char* line)
{
- struct command_context_s *cmd_ctx = priv;
connection_t *connection = cmd_ctx->output_handler_priv;
- telnet_connection_t *t_con = connection->priv;
- char buffer[512];
+ 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_write(connection, "\b\b \b\b", strlen("\b\b \b\b"));
+
+ telnet_outputline(connection, string);
+
+ telnet_prompt(connection);
+}
+
+int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *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);
- telnet_prompt(connection);
- t_con->suppress_prompt = 1;
- break;
- case TARGET_EVENT_RESUMED:
- command_print(cmd_ctx, "Target %i resumed", get_num_by_target(target));
- telnet_prompt(connection);
- t_con->suppress_prompt = 1;
+ target_arch_state(target);
break;
default:
break;
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);
}
telnet_connection->next_history = 0;
telnet_connection->current_history = 0;
-
+
target_register_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx);
+ log_add_callback(telnet_log_callback, connection);
+
+
+
return ERROR_OK;
}
/* 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;
{
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;
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);
}
}
}
}
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)
{
{
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);
continue;
}
- /* we're running a command, so we need a prompt
- * if the output handler is called, this gets set again */
- t_con->suppress_prompt = 0;
- if ((retval = command_run_line(command_context, t_con->line)) != ERROR_OK)
+ retval = command_run_line(command_context, t_con->line);
+
+ 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)
{
t_con->history[t_con->current_history] = strdup("");
}
- if (!t_con->suppress_prompt)
- {
- telnet_prompt(connection);
- }
- else
- {
- t_con->suppress_prompt = 0;
- }
+ int t = telnet_prompt(connection);
+ if (t == ERROR_SERVER_REMOTE_CLOSED)
+ return t;
t_con->line_size = 0;
t_con->line_cursor = 0;
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
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);
}
}
}
{
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;
{
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;
}
{
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;
{
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;
}
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;
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;
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);
}
}
telnet_connection_t *t_con = connection->priv;
int i;
+ log_remove_callback(telnet_log_callback, connection);
+
if (t_con->prompt)
+ {
free(t_con->prompt);
+ t_con->prompt = NULL;
+ }
for (i = 0; i < TELNET_LINE_HISTORY_SIZE; i++)
{
if (t_con->history[i])
+ {
free(t_con->history[i]);
+ t_con->history[i] = NULL;
+ }
}
/* if this connection registered a debug-message receiver delete it */
delete_debug_msg_receiver(connection->cmd_ctx, NULL);
if (connection->priv)
+ {
free(connection->priv);
+ connection->priv = NULL;
+ }
else
+ {
ERROR("BUG: connection->priv == NULL");
+ }
target_unregister_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx);
if (argc == 0)
return ERROR_OK;
- /* only if the port wasn't overwritten by cmdline */
- if (telnet_port == 0)
- telnet_port = strtoul(args[0], NULL, 0);
+ telnet_port = strtoul(args[0], NULL, 0);
return ERROR_OK;
}
Code Review / openocd.git / blobdiff