X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Ftelnet_server.c;h=c9c60bbda4e69723196b0f210a1a4500ff6099a2;hb=2b78a4e82b1845ee7cc89f6e31d7b49e9299cb32;hp=cc79ea411e02105d0dabbf1e80aba6dff5412e1b;hpb=655e4f88a6b7fd82a570a17cf1219356f4587a37;p=openocd.git

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index cc79ea411e..c9c60bbda4 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,23 +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 <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
-
-static unsigned short telnet_port = 0;
+static unsigned short telnet_port = 4444;
 
 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);
@@ -93,7 +86,7 @@ int telnet_outputline(connection_t *connection, const char *line)
 		if (line_end)
 		{
 			telnet_write(connection, "\r\n", 2);
-			line += len+1;
+			line += len + 1;
 		}
 		else
 		{
@@ -127,8 +120,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 +130,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));
@@ -194,12 +173,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;
 }
 
@@ -351,7 +326,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)
@@ -598,8 +575,6 @@ int telnet_connection_closed(connection_t *connection)
 		LOG_ERROR("BUG: connection->priv == NULL");
 	}
 
-	target_unregister_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx);
-
 	return ERROR_OK;
 }
 
@@ -621,13 +596,14 @@ int telnet_init(char *banner)
 
 	if (telnet_port == 0)
 	{
-		LOG_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;
 }
@@ -638,7 +614,7 @@ int telnet_register_commands(command_context_t *command_context)
 					 COMMAND_EXEC, "exit telnet session");
 
 	register_command(command_context, NULL, "telnet_port", handle_telnet_port_command,
-					 COMMAND_CONFIG, "");
+					 COMMAND_ANY, "port on which to listen for incoming telnet connections");
 
 	return ERROR_OK;
 }
@@ -646,12 +622,7 @@ int telnet_register_commands(command_context_t *command_context)
 /* daemon configuration command telnet_port */
 int handle_telnet_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	if (argc == 0)
-		return ERROR_OK;
-
-	telnet_port = strtoul(args[0], NULL, 0);
-
-	return ERROR_OK;
+	return server_port_command(cmd_ctx, cmd, args, argc, &telnet_port);
 }
 
 int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)