X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Ftcl_server.c;h=178d86ba8cef9b4cfd45d6cce04241d0cac8b8bf;hb=af84cd33a2e0b8af31d4c7dbd64cfd0348d65a0e;hp=8d2a0f71d79aeb7f22e9d866a73dd1faa84d7376;hpb=ef1cfb23947bd32798077c6abb5c25a049460ae9;p=openocd.git

diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index 8d2a0f71d7..178d86ba8c 100644
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -21,17 +21,8 @@
 #include "config.h"
 #endif
 
-#include <stdarg.h>
 #include "tcl_server.h"
 
-#include "log.h"
-#include "command.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
 
 #define TCL_SERVER_VERSION	"TCL Server 0.1"
 #define TCL_MAX_LINE		(4096)
@@ -43,8 +34,7 @@ typedef struct tcl_connection_s {
 	int tc_outerror; /* flag an output error */
 } tcl_connection_t;
 
-extern Jim_Interp *interp;
-static unsigned short tcl_port = 0;
+static unsigned short tcl_port = 6666;
 
 /* commands */
 static int handle_tcl_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
@@ -151,7 +141,7 @@ static int tcl_input(connection_t *connection)
 			if (memchr(result, '\n', reslen) == NULL)
 				tcl_output(connection, "\n", 1);
 		}
-		
+
 		tclc->tc_lineoffset = 0;
 		tclc->tc_linedrop = 0;
 	}
@@ -175,24 +165,22 @@ int tcl_init(void)
 
 	if (tcl_port == 0)
 	{
-		LOG_WARNING("no tcl port specified, using default port 6666");
-		tcl_port = 6666;
+		LOG_INFO("tcl port disabled");
+		return ERROR_OK;
 	}
 
-	retval = add_service("tcl", CONNECTION_TCL, tcl_port, 1, tcl_new_connection, tcl_input, tcl_closed, NULL);
+	retval = add_service("tcl", CONNECTION_TCP, tcl_port, 1, tcl_new_connection, tcl_input, tcl_closed, NULL);
 	return retval;
 }
 
 int tcl_register_commands(command_context_t *cmd_ctx)
 {
-	register_command(cmd_ctx, NULL, "tcl_port", handle_tcl_port_command, COMMAND_CONFIG, "");
+	register_command(cmd_ctx, NULL, "tcl_port", handle_tcl_port_command, COMMAND_CONFIG, "port on which to listen for incoming TCL syntax");
 	return ERROR_OK;
 }
 
-static int handle_tcl_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int handle_tcl_port_command(struct command_context_s *cmd_ctx,
+		char *cmd, char **args, int argc)
 {
-	if (argc == 1) {
-		tcl_port = strtoul(args[0], NULL, 0);
-	}
-	return ERROR_OK;
+	return server_port_command(cmd_ctx, cmd, args, argc, &tcl_port);
 }