* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "replacements.h"
+
#include "telnet_server.h"
#include "server.h"
#include "log.h"
#include "command.h"
#include "target.h"
+#include "target_request.h"
#include <stdlib.h>
#include <unistd.h>
{
telnet_connection_t *t_con = connection->priv;
- write(connection->fd, t_con->prompt, strlen(t_con->prompt));
+ write_socket(connection->fd, t_con->prompt, strlen(t_con->prompt));
}
int telnet_output(struct command_context_s *cmd_ctx, char* line)
{
connection_t *connection = cmd_ctx->output_handler_priv;
- write(connection->fd, line, strlen(line));
- write(connection->fd, "\r\n\0", 3);
+ write_socket(connection->fd, line, strlen(line));
+ write_socket(connection->fd, "\r\n\0", 3);
return ERROR_OK;
}
+void telnet_log_callback(void *priv, const char *file, int line,
+ const char *function, const char *format, va_list args)
+{
+ connection_t *connection = priv;
+ char *t = allocPrintf(format, args);
+ if (t == NULL)
+ return;
+
+ telnet_output(connection->cmd_ctx, t);
+ free(t);
+}
+
int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
{
struct command_context_s *cmd_ctx = priv;
target->type->arch_state(target, buffer, 512);
buffer[511] = 0;
command_print(cmd_ctx, "%s", buffer);
- telnet_prompt(connection);
- t_con->suppress_prompt = 1;
+ 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));
- telnet_prompt(connection);
- t_con->suppress_prompt = 1;
+ if (!t_con->suppress_prompt)
+ telnet_prompt(connection);
break;
default:
break;
command_set_output_handler(connection->cmd_ctx, telnet_output, connection);
/* negotiate telnet options */
- write(connection->fd, negotiate, strlen(negotiate));
+ write_socket(connection->fd, negotiate, strlen(negotiate));
/* print connection banner */
if (telnet_service->banner)
{
- write(connection->fd, telnet_service->banner, strlen(telnet_service->banner));
- write(connection->fd, "\r\n\0", 3);
+ write_socket(connection->fd, telnet_service->banner, strlen(telnet_service->banner));
+ write_socket(connection->fd, "\r\n\0", 3);
}
telnet_prompt(connection);
/* move to end of line */
if (t_con->line_cursor < t_con->line_size)
{
- write(connection->fd, t_con->line + t_con->line_cursor, 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);
}
/* backspace, overwrite with space, backspace */
while (t_con->line_size > 0)
{
- write(connection->fd, "\b \b", 3);
+ write_socket(connection->fd, "\b \b", 3);
t_con->line_size--;
}
t_con->line_cursor = 0;
telnet_connection_t *t_con = connection->priv;
command_context_t *command_context = connection->cmd_ctx;
- bytes_read = read(connection->fd, buffer, TELNET_BUFFER_SIZE);
+ bytes_read = read_socket(connection->fd, buffer, TELNET_BUFFER_SIZE);
if (bytes_read == 0)
return ERROR_SERVER_REMOTE_CLOSED;
{
if (isprint(*buf_p)) /* printable character */
{
- write(connection->fd, buf_p, 1);
+ write_socket(connection->fd, 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(connection->fd, t_con->line + t_con->line_cursor, 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);
for (i = t_con->line_cursor; i < t_con->line_size; i++)
{
- write(connection->fd, "\b", 1);
+ write_socket(connection->fd, "\b", 1);
}
}
}
}
t_con->line[t_con->line_size] = 0;
- write(connection->fd, "\r\n\x00", 3);
+ write_socket(connection->fd, "\r\n\x00", 3);
if (strcmp(t_con->line, "history") == 0)
{
{
if (t_con->history[i])
{
- write(connection->fd, t_con->history[i], strlen(t_con->history[i]));
- write(connection->fd, "\r\n\x00", 3);
+ write_socket(connection->fd, t_con->history[i], strlen(t_con->history[i]));
+ write_socket(connection->fd, "\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;
+ log_setCallback(telnet_log_callback, connection);
+ t_con->suppress_prompt = 1;
+
if ((retval = command_run_line(command_context, t_con->line)) != ERROR_OK)
{
if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
}
}
- /* if the history slot is already taken, free it */
- if (t_con->history[t_con->next_history])
- {
- free(t_con->history[t_con->next_history]);
- }
-
- /* add line to history */
- t_con->history[t_con->next_history++] = strdup(t_con->line);
-
- /* current history line starts at the new entry */
- t_con->current_history = t_con->next_history;
+ t_con->suppress_prompt = 0;
- if (t_con->history[t_con->current_history])
+ /* Save only non-blank lines in the history */
+ if (t_con->line_size > 0)
{
- free(t_con->history[t_con->current_history]);
- }
- t_con->history[t_con->current_history] = strdup("");
+ /* if the history slot is already taken, free it */
+ if (t_con->history[t_con->next_history])
+ {
+ free(t_con->history[t_con->next_history]);
+ }
+
+ /* add line to history */
+ t_con->history[t_con->next_history] = strdup(t_con->line);
+
+ /* wrap history at TELNET_LINE_HISTORY_SIZE */
+ t_con->next_history = (t_con->next_history + 1) % TELNET_LINE_HISTORY_SIZE;
- /* wrap history at TELNET_LINE_HISTORY_SIZE */
- if (t_con->next_history > TELNET_LINE_HISTORY_SIZE - 1)
- t_con->next_history = 0;
+ /* current history line starts at the new entry */
+ t_con->current_history = t_con->next_history;
- if (!t_con->suppress_prompt)
- {
- telnet_prompt(connection);
- }
- else
- {
- t_con->suppress_prompt = 0;
+ if (t_con->history[t_con->current_history])
+ {
+ free(t_con->history[t_con->current_history]);
+ }
+ t_con->history[t_con->current_history] = strdup("");
}
+ /* output prompt after command */
+ telnet_prompt(connection);
+
t_con->line_size = 0;
t_con->line_cursor = 0;
}
if (t_con->line_cursor != t_con->line_size)
{
int i;
- write(connection->fd, "\b", 1);
+ write_socket(connection->fd, "\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(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor);
- write(connection->fd, " \b", 2);
+ 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);
for (i = t_con->line_cursor; i < t_con->line_size; i++)
{
- write(connection->fd, "\b", 1);
+ write_socket(connection->fd, "\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(connection->fd, "\b \b", 3);
+ write_socket(connection->fd, "\b \b", 3);
}
}
}
{
if (t_con->line_cursor > 0)
{
- write(connection->fd, "\b", 1);
+ write_socket(connection->fd, "\b", 1);
t_con->line_cursor--;
}
t_con->state = TELNET_STATE_DATA;
{
if (t_con->line_cursor < t_con->line_size)
{
- write(connection->fd, t_con->line + t_con->line_cursor++, 1);
+ write_socket(connection->fd, t_con->line + t_con->line_cursor++, 1);
}
t_con->state = TELNET_STATE_DATA;
}
{
if (t_con->line_cursor > 0)
{
- write(connection->fd, "\b", 1);
+ write_socket(connection->fd, "\b", 1);
t_con->line_cursor--;
}
t_con->state = TELNET_STATE_DATA;
{
if (t_con->line_cursor < t_con->line_size)
{
- write(connection->fd, t_con->line + t_con->line_cursor++, 1);
+ write_socket(connection->fd, t_con->line + t_con->line_cursor++, 1);
}
t_con->state = TELNET_STATE_DATA;
}
else if (*buf_p == 'A') /* cursor up */
{
- int last_history = (t_con->current_history - 1 >= 0) ? t_con->current_history - 1 : 127;
+ int last_history = (t_con->current_history > 0) ? t_con->current_history - 1 : TELNET_LINE_HISTORY_SIZE-1;
if (t_con->history[last_history])
{
telnet_clear_line(connection, t_con);
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(connection->fd, t_con->line, t_con->line_size);
+ write_socket(connection->fd, t_con->line, t_con->line_size);
t_con->current_history = last_history;
}
t_con->state = TELNET_STATE_DATA;
}
else if (*buf_p == 'B') /* cursor down */
{
- int next_history = (t_con->current_history + 1 < 128) ? t_con->current_history + 1 : 0;
+ int next_history = (t_con->current_history + 1) % TELNET_LINE_HISTORY_SIZE;
if (t_con->history[next_history])
{
telnet_clear_line(connection, t_con);
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(connection->fd, t_con->line, t_con->line_size);
+ write_socket(connection->fd, 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(connection->fd, t_con->line + t_con->line_cursor, 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);
/* overwrite last char with whitespace */
- write(connection->fd, " \b", 2);
+ write_socket(connection->fd, " \b", 2);
/* move back to cursor position*/
for (i = t_con->line_cursor; i < t_con->line_size; i++)
{
- write(connection->fd, "\b", 1);
+ write_socket(connection->fd, "\b", 1);
}
}
int i;
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);
Code Review / openocd.git / blobdiff