X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Ftelnet_server.c;h=6cb4746230334ed7623f951d89e4511f06b91da6;hp=73579e4ba0be40430c485e21592576e790870a02;hb=5b6df55a1e5e4c0f531bc336691bc7c9a6a0df87;hpb=970e16603bde0a4c5334e5eb3c81264830b55798 diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index 73579e4ba0..6cb4746230 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -2,6 +2,12 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -21,26 +27,10 @@ #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 -#include -#include -#include -#include - -static unsigned short telnet_port = 0; - -int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int handle_telnet_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static unsigned short telnet_port = 4444; static char *negotiate = "\xFF\xFB\x03" /* IAC WILL Suppress Go Ahead */ @@ -92,8 +82,8 @@ int telnet_outputline(connection_t *connection, const char *line) telnet_write(connection, line, len); if (line_end) { - telnet_write(connection, "\r\n\0", 3); - line += len+1; + telnet_write(connection, "\r\n", 2); + line += len + 1; } else { @@ -104,14 +94,14 @@ int telnet_outputline(connection_t *connection, const char *line) return ERROR_OK; } -int telnet_output(struct command_context_s *cmd_ctx, char* line) +int telnet_output(struct command_context_s *cmd_ctx, const char* line) { connection_t *connection = cmd_ctx->output_handler_priv; return telnet_outputline(connection, line); } -void telnet_log_callback(void *priv, const char *file, int line, +void telnet_log_callback(void *priv, const char *file, unsigned line, const char *function, const char *string) { connection_t *connection = priv; @@ -127,8 +117,8 @@ void telnet_log_callback(void *priv, const char *file, int line, /* clear the command line */ telnet_write(connection, "\r", 1); - for (i = strlen(t_con->prompt) + t_con->line_size; i>0; i-=16) - telnet_write(connection, " ", i>16 ? 16 : i); + for (i = strlen(t_con->prompt) + t_con->line_size; i > 0; i -= 16) + telnet_write(connection, " ", i > 16 ? 16 : i); telnet_write(connection, "\r", 1); /* output the message */ @@ -137,24 +127,10 @@ void telnet_log_callback(void *priv, const char *file, int line, /* put the command line to its previous state */ telnet_prompt(connection); telnet_write(connection, t_con->line, t_con->line_size); - for (i=t_con->line_size; i>t_con->line_cursor; i--) + for (i = t_con->line_size; i > t_con->line_cursor; i--) telnet_write(connection, "\b", 1); } -int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv) -{ - switch (event) - { - case TARGET_EVENT_HALTED: - target_arch_state(target); - break; - default: - break; - } - - return ERROR_OK; -} - int telnet_new_connection(connection_t *connection) { telnet_connection_t *telnet_connection = malloc(sizeof(telnet_connection_t)); @@ -181,7 +157,7 @@ int telnet_new_connection(connection_t *connection) if (telnet_service->banner) { telnet_write(connection, telnet_service->banner, strlen(telnet_service->banner)); - telnet_write(connection, "\r\n\0", 3); + telnet_write(connection, "\r\n", 2); } telnet_prompt(connection); @@ -194,12 +170,8 @@ 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); - log_add_callback(telnet_log_callback, connection); - - return ERROR_OK; } @@ -234,7 +206,7 @@ int telnet_input(connection_t *connection) return ERROR_SERVER_REMOTE_CLOSED; else if (bytes_read == -1) { - ERROR("error during read: %s", strerror(errno)); + LOG_ERROR("error during read: %s", strerror(errno)); return ERROR_SERVER_REMOTE_CLOSED; } @@ -351,7 +323,9 @@ int telnet_input(connection_t *connection) t_con->line_size = 0; t_con->line_cursor = -1; /* to supress prompt in log callback during command execution */ + retval = command_run_line(command_context, t_con->line); + t_con->line_cursor = 0; if (retval == ERROR_COMMAND_CLOSE_CONNECTION) @@ -413,7 +387,7 @@ int telnet_input(connection_t *connection) } else { - DEBUG("unhandled nonprintable: %2.2x", *buf_p); + LOG_DEBUG("unhandled nonprintable: %2.2x", *buf_p); } } } @@ -546,13 +520,13 @@ int telnet_input(connection_t *connection) } else { - ERROR("BUG: unexpected value in t_con->last_escape"); + LOG_ERROR("BUG: unexpected value in t_con->last_escape"); t_con->state = TELNET_STATE_DATA; } break; default: - ERROR("unknown telnet state"); + LOG_ERROR("unknown telnet state"); exit(-1); } @@ -595,11 +569,9 @@ int telnet_connection_closed(connection_t *connection) } else { - ERROR("BUG: connection->priv == NULL"); + LOG_ERROR("BUG: connection->priv == NULL"); } - target_unregister_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx); - return ERROR_OK; } @@ -621,40 +593,40 @@ int telnet_init(char *banner) if (telnet_port == 0) { - WARNING("no telnet port specified, using default port 4444"); - telnet_port = 4444; + LOG_INFO("telnet port disabled"); + free(telnet_service); + return ERROR_OK; } telnet_service->banner = banner; - add_service("telnet", CONNECTION_TELNET, telnet_port, 1, telnet_new_connection, telnet_input, telnet_connection_closed, telnet_service); + add_service("telnet", CONNECTION_TCP, telnet_port, 1, telnet_new_connection, telnet_input, telnet_connection_closed, telnet_service); return ERROR_OK; } -int telnet_register_commands(command_context_t *command_context) +/* daemon configuration command telnet_port */ +COMMAND_HANDLER(handle_telnet_port_command) { - register_command(command_context, NULL, "exit", handle_exit_command, - COMMAND_EXEC, "exit telnet session"); - - register_command(command_context, NULL, "telnet_port", handle_telnet_port_command, - COMMAND_CONFIG, ""); + return CALL_COMMAND_HANDLER(server_port_command, &telnet_port); +} - return ERROR_OK; +COMMAND_HANDLER(handle_exit_command) +{ + return ERROR_COMMAND_CLOSE_CONNECTION; } -/* daemon configuration command telnet_port */ -int handle_telnet_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int telnet_register_commands(command_context_t *command_context) { - if (argc == 0) - return ERROR_OK; + register_command(command_context, NULL, "exit", + &handle_exit_command, COMMAND_EXEC, + "exit telnet session"); - telnet_port = strtoul(args[0], NULL, 0); + register_command(command_context, NULL, "telnet_port", + &handle_telnet_port_command, COMMAND_ANY, + "port on which to listen for incoming telnet connections"); return ERROR_OK; } -int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - return ERROR_COMMAND_CLOSE_CONNECTION; -} +