Author: Nicolas Pitre <nico@cam.org>

[openocd.git] / src / server / tcl_server.c

diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index 2f4c1899ec37bf81b844a8f21f8d18c5c14b51f4..e146b04f927c364b45a8736929af06ff1d5e9e56 100644 (file)
--- 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,7 +34,6 @@ 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;
 
 /* commands */
@@ -143,7 +133,7 @@ static int tcl_input(connection_t *connection)
                }
                else {
                        tclc->tc_line[tclc->tc_lineoffset-1] = '\0';
-                       retval = Jim_Eval(interp, tclc->tc_line);
+                       retval = Jim_Eval_Named(interp, tclc->tc_line, "remote:connection",1);
                        result = Jim_GetString(Jim_GetResult(interp), &reslen);
                        retval = tcl_output(connection, result, reslen);
                        if (retval != ERROR_OK)
@@ -175,17 +165,17 @@ int tcl_init(void)
 
        if (tcl_port == 0)
        {
-               LOG_WARNING("no tcl port specified, using default port 6666");
+               LOG_DEBUG("no tcl port specified, using default port 6666");
                tcl_port = 6666;
        }
 
-       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;
 }