Charles Hardin <ckhardin@gmail.com> - Tcl Server

git-svn-id: svn://svn.berlios.de/openocd/trunk@757 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/openocd.c b/src/openocd.c
index b6b217df3cef91cd3b75a1bb7a6641ed8f394069..5439ece08c91f83fdf682566ea260355f8e97add 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -143,6 +143,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        /* initialize telnet subsystem */
        telnet_init("Open On-Chip Debugger");
        gdb_init();
+       tcl_init(); /* allows tcl to just connect without going thru telnet */
 
        return ERROR_OK;
 }
@@ -641,6 +642,7 @@ int main(int argc, char *argv[])
        server_register_commands(cmd_ctx);
        telnet_register_commands(cmd_ctx);
        gdb_register_commands(cmd_ctx);
+       tcl_register_commands(cmd_ctx); /* tcl server commands */
        log_register_commands(cmd_ctx);
        jtag_register_commands(cmd_ctx);
        interpreter_register_commands(cmd_ctx);

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 77256093ae3e4a7d3cc420b5fd75710f46b93763..63bcc04300796379b8d41a200c601c631bf2b047 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -3,3 +3,7 @@ METASOURCES = AUTO
 noinst_LIBRARIES = libserver.a
 noinst_HEADERS = server.h telnet_server.h gdb_server.h
 libserver_a_SOURCES = server.c telnet_server.c gdb_server.c
+
+# tcl server addons
+noinst_HEADERS += tcl_server.h
+libserver_a_SOURCES += tcl_server.c

diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
new file mode 100644 (file)
index 0000000..b007309
--- /dev/null
+++ b/src/server/tcl_server.c
@@ -0,0 +1,200 @@
+/***************************************************************************\r
+ *   Copyright (C) 2008                                                    *\r
+ *                                                                         *\r
+ *   This program is free software; you can redistribute it and/or modify  *\r
+ *   it under the terms of the GNU General Public License as published by  *\r
+ *   the Free Software Foundation; either version 2 of the License, or     *\r
+ *   (at your option) any later version.                                   *\r
+ *                                                                         *\r
+ *   This program is distributed in the hope that it will be useful,       *\r
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *\r
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *\r
+ *   GNU General Public License for more details.                          *\r
+ *                                                                         *\r
+ *   You should have received a copy of the GNU General Public License     *\r
+ *   along with this program; if not, write to the                         *\r
+ *   Free Software Foundation, Inc.,                                       *\r
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *\r
+ ***************************************************************************/\r
+\r
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif\r
+\r
+#include "tcl_server.h"\r
+\r
+#include "../jim.h"\r
+#include "log.h"\r
+#include "command.h"\r
+\r
+#include <stdlib.h>\r
+#include <unistd.h>\r
+#include <errno.h>\r
+#include <string.h>\r
+#include <ctype.h>\r
+\r
+#define TCL_SERVER_VERSION     "TCL Server 0.1"\r
+#define TCL_MAX_LINE           (4096)\r
+\r
+typedef struct tcl_connection_s {\r
+       int tc_linedrop;\r
+       int tc_lineoffset;\r
+       char tc_line[TCL_MAX_LINE];\r
+\r
+       int tc_outerror; /* flag an output error */\r
+} tcl_connection_t;\r
+\r
+extern Jim_Interp *interp;\r
+static unsigned short tcl_port = 0;\r
+\r
+/* commands */\r
+static int handle_tcl_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);\r
+\r
+/* handlers */\r
+static int tcl_new_connection(connection_t *connection);\r
+static int tcl_input(connection_t *connection);\r
+static int tcl_output(connection_t *connection, const void *buf, ssize_t len);\r
+static int tcl_closed(connection_t *connection);\r
+\r
+/* write data out to a socket.\r
+ *\r
+ * this is a blocking write, so the return value must equal the length, if\r
+ * that is not the case then flag the connection with an output error.\r
+ */\r
+int tcl_output(connection_t *connection, const void *data, ssize_t len)\r
+{\r
+       ssize_t wlen;\r
+       tcl_connection_t *tclc;\r
+\r
+       tclc = connection->priv;\r
+       if (tclc->tc_outerror)\r
+               return ERROR_SERVER_REMOTE_CLOSED;\r
+\r
+       wlen = write_socket(connection->fd, data, len);\r
+       if (wlen == len)\r
+               return ERROR_OK;\r
+\r
+       LOG_ERROR("error during write: %d != %d", wlen, len);\r
+       tclc->tc_outerror = 1;\r
+       return ERROR_SERVER_REMOTE_CLOSED;\r
+}\r
+\r
+\r
+/* connections */\r
+static int tcl_new_connection(connection_t *connection)\r
+{\r
+       int i;\r
+       tcl_connection_t *tclc;\r
+\r
+       tclc = malloc(sizeof(tcl_connection_t));\r
+       if (tclc == NULL)\r
+               return ERROR_CONNECTION_REJECTED;\r
+\r
+       memset(tclc, 0, sizeof(tcl_connection_t));\r
+       connection->priv = tclc;\r
+       return ERROR_OK;\r
+}\r
+\r
+static int tcl_input(connection_t *connection)\r
+{\r
+       int retval;\r
+       int i;\r
+       ssize_t rlen;\r
+       const char *result;\r
+       int reslen;\r
+       tcl_connection_t *tclc;\r
+       char in[256];\r
+\r
+       rlen = read_socket(connection->fd, &in, sizeof(in));\r
+       if (rlen <= 0) {\r
+               if (rlen < 0)\r
+                       LOG_ERROR("error during read: %s", strerror(errno));\r
+               return ERROR_SERVER_REMOTE_CLOSED;\r
+       }\r
+\r
+       tclc = connection->priv;\r
+       if (tclc == NULL)\r
+               return ERROR_CONNECTION_REJECTED;\r
+\r
+       /* push as much data into the line as possible */\r
+       for (i = 0; i < rlen; i++)\r
+       {\r
+               if (!isprint(in[i]) && !isspace(in[i]))\r
+               {\r
+                       /* drop this line */\r
+                       tclc->tc_linedrop = 1;\r
+                       continue;\r
+               }\r
+\r
+               /* buffer the data */\r
+               tclc->tc_line[tclc->tc_lineoffset] = in[i];\r
+               if (tclc->tc_lineoffset < TCL_MAX_LINE)\r
+                       tclc->tc_lineoffset++;\r
+               else\r
+                       tclc->tc_linedrop = 1;\r
+\r
+               if (in[i] != '\n')\r
+                       continue;\r
+\r
+               /* process the line */\r
+               if (tclc->tc_linedrop) {\r
+#define ESTR "line too long\n"\r
+                       retval = tcl_output(connection, ESTR, sizeof(ESTR));\r
+                       if (retval != ERROR_OK)\r
+                               return retval;\r
+#undef ESTR\r
+               } else {\r
+                       tclc->tc_line[tclc->tc_lineoffset-1] = '\0';\r
+                       retval = Jim_Eval(interp, tclc->tc_line);\r
+                       result = Jim_GetString(Jim_GetResult(interp), &reslen);\r
+                       retval = tcl_output(connection, result, reslen);\r
+                       if (retval != ERROR_OK)\r
+                               return retval;\r
+                       if (memchr(result, '\n', reslen) == NULL)\r
+                               tcl_output(connection, "\n", 1);\r
+               }\r
+               tclc->tc_lineoffset = 0;\r
+               tclc->tc_linedrop = 0;\r
+       }\r
+\r
+       return ERROR_OK;\r
+}\r
+\r
+static int tcl_closed(connection_t *connection)\r
+{\r
+       /* cleanup connection context */\r
+       if (connection->priv) {\r
+               free(connection->priv);\r
+               connection->priv = NULL;\r
+       }\r
+       return ERROR_OK;\r
+}\r
+\r
+int tcl_init(void)\r
+{\r
+       int retval;\r
+\r
+       if (tcl_port == 0)\r
+       {\r
+               LOG_WARNING("no tcl port specified, using default port 5555");\r
+               tcl_port = 5555;\r
+       }\r
+\r
+       retval = add_service("tcl", CONNECTION_TCL, tcl_port, 1, tcl_new_connection, tcl_input, tcl_closed, NULL);\r
+       return retval;\r
+}\r
+\r
+\r
+int tcl_register_commands(command_context_t *cmd_ctx)\r
+{\r
+       register_command(cmd_ctx, NULL, "tcl_port", handle_tcl_port_command, COMMAND_CONFIG, "");\r
+       return ERROR_OK;\r
+}\r
+\r
+static int handle_tcl_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)\r
+{\r
+       if (argc == 1) {\r
+               tcl_port = strtoul(args[0], NULL, 0);\r
+       }\r
+       return ERROR_OK;\r
+}\r

diff --git a/src/server/tcl_server.h b/src/server/tcl_server.h
new file mode 100644 (file)
index 0000000..7ce8f2f
--- /dev/null
+++ b/src/server/tcl_server.h
@@ -0,0 +1,28 @@
+/***************************************************************************\r
+ *   Copyright (C) 2008                                                    *\r
+ *                                                                         *\r
+ *   This program is free software; you can redistribute it and/or modify  *\r
+ *   it under the terms of the GNU General Public License as published by  *\r
+ *   the Free Software Foundation; either version 2 of the License, or     *\r
+ *   (at your option) any later version.                                   *\r
+ *                                                                         *\r
+ *   This program is distributed in the hope that it will be useful,       *\r
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *\r
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *\r
+ *   GNU General Public License for more details.                          *\r
+ *                                                                         *\r
+ *   You should have received a copy of the GNU General Public License     *\r
+ *   along with this program; if not, write to the                         *\r
+ *   Free Software Foundation, Inc.,                                       *\r
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *\r
+ ***************************************************************************/\r
+\r
+#ifndef _TCL_SERVER_H_\r
+#define _TCL_SERVER_H_\r
+\r
+#include "server.h"\r
+\r
+extern int tcl_init(void);\r
+extern int tcl_register_commands(command_context_t *cmd_ctx);\r
+\r
+#endif /* _TCL_SERVER_H_ */\r