X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Ftelnet_server.c;h=9c6115588f43bd4e696d3f3d3d16ffd03d3d6205;hp=bb888aa51f87f72b171bc1bf7fee9ec2e1226250;hb=f2cbaba3cc4af99db7b4f2682c2e0dd4467655e3;hpb=8959de9f679cfd0436d731fd91b88a68b9a75fa6

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index bb888aa51f..9c6115588f 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
@@ -32,9 +32,6 @@
 
 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);
-
 static char *negotiate =
 		"\xFF\xFB\x03"		/* IAC WILL Suppress Go Ahead */
 		"\xFF\xFB\x01"		/* IAC WILL Echo */
@@ -104,7 +101,7 @@ int telnet_output(struct command_context_s *cmd_ctx, const char* line)
 	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;
@@ -120,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 */
@@ -130,14 +127,14 @@ 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_new_connection(connection_t *connection)
 {
 	telnet_connection_t *telnet_connection = malloc(sizeof(telnet_connection_t));
-	telnet_service_t *telnet_service = connection->service->priv;
+	struct telnet_service *telnet_service = connection->service->priv;
 	int i;
 
 	connection->priv = telnet_connection;
@@ -592,11 +589,12 @@ int telnet_set_prompt(connection_t *connection, char *prompt)
 
 int telnet_init(char *banner)
 {
-	telnet_service_t *telnet_service = malloc(sizeof(telnet_service_t));
+	struct telnet_service *telnet_service = malloc(sizeof(struct telnet_service));
 
 	if (telnet_port == 0)
 	{
 		LOG_INFO("telnet port disabled");
+		free(telnet_service);
 		return ERROR_OK;
 	}
 
@@ -607,32 +605,28 @@ int telnet_init(char *banner)
 	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_ANY, "port on which to listen for incoming telnet connections");
+	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)
-	{
-		command_print(cmd_ctx, "%d", telnet_port);
-		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;
-}
+