#define CTRL(c) (c - '@')
-
/* 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, void *data, int len)
+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;
- if (write_socket(connection->fd, data, len)==len)
+ if (write_socket(connection->fd, data, len) == len)
{
return ERROR_OK;
}
- t_con->closed=1;
+ t_con->closed = 1;
return ERROR_SERVER_REMOTE_CLOSED;
}
-
int telnet_prompt(connection_t *connection)
{
telnet_connection_t *t_con = connection->priv;
return telnet_write(connection, t_con->prompt, strlen(t_con->prompt));
}
-int telnet_outputline(connection_t *connection, char* line)
+int telnet_outputline(connection_t *connection, const char *line)
{
- telnet_write(connection, line, strlen(line));
- return telnet_write(connection, "\r\n\0", 3);
-}
+ int len;
+
+ /* 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_output(struct command_context_s *cmd_ctx, char* line)
{
}
void telnet_log_callback(void *priv, const char *file, int line,
- const char *function, const char *format, va_list args)
+ const char *function, const char *string)
{
connection_t *connection = priv;
- char *t=allocPrintf(format, args);
- if (t==NULL)
- return;
- telnet_outputline(connection, t);
+ telnet_write(connection, "\b\b \b\b", strlen("\b\b \b\b"));
+
+ telnet_outputline(connection, string);
- free(t);
+ telnet_prompt(connection);
}
-
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];
-
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);
- break;
- case TARGET_EVENT_RESUMED:
- command_print(cmd_ctx, "Target %i resumed", get_num_by_target(target));
+ target_arch_state(target);
break;
default:
break;
target_register_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx);
+ log_add_callback(telnet_log_callback, connection);
+
+
+
return ERROR_OK;
}
{
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)
{
continue;
}
- log_setCallback(telnet_log_callback, connection);
+ retval = command_run_line(command_context, t_con->line);
- if ((retval = command_run_line(command_context, t_con->line)) != ERROR_OK)
+ 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("");
}
- int t=telnet_prompt(connection);
- if (t==ERROR_SERVER_REMOTE_CLOSED)
+ int t = telnet_prompt(connection);
+ if (t == ERROR_SERVER_REMOTE_CLOSED)
return t;
t_con->line_size = 0;
telnet_connection_t *t_con = connection->priv;
int i;
+ log_remove_callback(telnet_log_callback, connection);
+
if (t_con->prompt)
{
free(t_con->prompt);
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;
}