X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Ftcl_server.c;h=9aaee5c6cc4f0f94ff3bcab08199b316ba12dec8;hp=a12442ea7d425a091a38292a6e6e67eaf81ed1c0;hb=5a41435e45ae18c0823780382c214fb7324dbe7d;hpb=8a14a72f573065fc38ed2e4029d2a41d701c3622 diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c index a12442ea7d..9aaee5c6cc 100644 --- a/src/server/tcl_server.c +++ b/src/server/tcl_server.c @@ -1,5 +1,6 @@ /*************************************************************************** - * Copyright (C) 2008 * + * Copyright (C) 2010 Øyvind Harboe * + * oyvind.harboe@zylin.com * * * * 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 * @@ -21,180 +22,177 @@ #include "config.h" #endif -#include #include "tcl_server.h" -#include "jim.h" -#include "log.h" -#include "command.h" -#include -#include -#include -#include -#include +#define TCL_SERVER_VERSION "TCL Server 0.1" +#define TCL_MAX_LINE (4096) -#define TCL_SERVER_VERSION "TCL Server 0.1" -#define TCL_MAX_LINE (4096) +struct tcl_connection { + int tc_linedrop; + int tc_lineoffset; + char tc_line[TCL_MAX_LINE]; + int tc_outerror; /* flag an output error */ +}; -typedef struct tcl_connection_s { - int tc_linedrop; - int tc_lineoffset; - char tc_line[TCL_MAX_LINE]; - - int tc_outerror; /* flag an output error */ -} tcl_connection_t; - -extern Jim_Interp *interp; -static unsigned short tcl_port = 0; - -/* commands */ -static int handle_tcl_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static unsigned short tcl_port = 6666; /* handlers */ -static int tcl_new_connection(connection_t *connection); -static int tcl_input(connection_t *connection); -static int tcl_output(connection_t *connection, const void *buf, ssize_t len); -static int tcl_closed(connection_t *connection); +static int tcl_new_connection(struct connection *connection); +static int tcl_input(struct connection *connection); +static int tcl_output(struct connection *connection, const void *buf, ssize_t len); +static int tcl_closed(struct connection *connection); /* write data out to a socket. * * this is a blocking write, so the return value must equal the length, if * that is not the case then flag the connection with an output error. */ -int tcl_output(connection_t *connection, const void *data, ssize_t len) +int tcl_output(struct connection *connection, const void *data, ssize_t len) { - ssize_t wlen; - tcl_connection_t *tclc; + ssize_t wlen; + struct tcl_connection *tclc; - tclc = connection->priv; - if (tclc->tc_outerror) - return ERROR_SERVER_REMOTE_CLOSED; + tclc = connection->priv; + if (tclc->tc_outerror) + return ERROR_SERVER_REMOTE_CLOSED; - wlen = write_socket(connection->fd, data, len); - if (wlen == len) - return ERROR_OK; + wlen = write_socket(connection->fd, data, len); - LOG_ERROR("error during write: %d != %d", (int)wlen, (int)len); - tclc->tc_outerror = 1; - return ERROR_SERVER_REMOTE_CLOSED; -} + if (wlen == len) + return ERROR_OK; + LOG_ERROR("error during write: %d != %d", (int)wlen, (int)len); + tclc->tc_outerror = 1; + return ERROR_SERVER_REMOTE_CLOSED; +} /* connections */ -static int tcl_new_connection(connection_t *connection) +static int tcl_new_connection(struct connection *connection) { - tcl_connection_t *tclc; + struct tcl_connection *tclc; - tclc = malloc(sizeof(tcl_connection_t)); - if (tclc == NULL) - return ERROR_CONNECTION_REJECTED; + tclc = malloc(sizeof(struct tcl_connection)); + if (tclc == NULL) + return ERROR_CONNECTION_REJECTED; - memset(tclc, 0, sizeof(tcl_connection_t)); - connection->priv = tclc; - return ERROR_OK; + memset(tclc, 0, sizeof(struct tcl_connection)); + connection->priv = tclc; + return ERROR_OK; } -static int tcl_input(connection_t *connection) +static int tcl_input(struct connection *connection) { - int retval; - int i; - ssize_t rlen; - const char *result; - int reslen; - tcl_connection_t *tclc; - char in[256]; - - rlen = read_socket(connection->fd, &in, sizeof(in)); - if (rlen <= 0) { - if (rlen < 0) - LOG_ERROR("error during read: %s", strerror(errno)); - return ERROR_SERVER_REMOTE_CLOSED; - } - - tclc = connection->priv; - if (tclc == NULL) - return ERROR_CONNECTION_REJECTED; - - /* push as much data into the line as possible */ - for (i = 0; i < rlen; i++) - { - if (!isprint(in[i]) && !isspace(in[i])) - { - /* drop this line */ - tclc->tc_linedrop = 1; - continue; - } - - /* buffer the data */ - tclc->tc_line[tclc->tc_lineoffset] = in[i]; - if (tclc->tc_lineoffset < TCL_MAX_LINE) - tclc->tc_lineoffset++; - else - tclc->tc_linedrop = 1; - - if (in[i] != '\n') - continue; - - /* process the line */ - if (tclc->tc_linedrop) { + Jim_Interp *interp = (Jim_Interp *)connection->cmd_ctx->interp; + int retval; + int i; + ssize_t rlen; + const char *result; + int reslen; + struct tcl_connection *tclc; + unsigned char in[256]; + + rlen = read_socket(connection->fd, &in, sizeof(in)); + if (rlen <= 0) { + if (rlen < 0) + LOG_ERROR("error during read: %s", strerror(errno)); + return ERROR_SERVER_REMOTE_CLOSED; + } + + tclc = connection->priv; + if (tclc == NULL) + return ERROR_CONNECTION_REJECTED; + + /* push as much data into the line as possible */ + for (i = 0; i < rlen; i++) + { + /* buffer the data */ + tclc->tc_line[tclc->tc_lineoffset] = in[i]; + if (tclc->tc_lineoffset < TCL_MAX_LINE) + tclc->tc_lineoffset++; + else + tclc->tc_linedrop = 1; + + /* ctrl-z is end of command. When testing from telnet, just + * press ctrl-z a couple of times first to put telnet into the + * mode where it will send 0x1a in response to pressing ctrl-z + */ + if (in[i] != '\x1a') + continue; + + /* process the line */ + if (tclc->tc_linedrop) { #define ESTR "line too long\n" - retval = tcl_output(connection, ESTR, sizeof(ESTR)); - if (retval != ERROR_OK) - return retval; + retval = tcl_output(connection, ESTR, sizeof(ESTR)); + if (retval != ERROR_OK) + return retval; #undef ESTR - } else { - tclc->tc_line[tclc->tc_lineoffset-1] = '\0'; - retval = Jim_Eval(interp, tclc->tc_line); - result = Jim_GetString(Jim_GetResult(interp), &reslen); - retval = tcl_output(connection, result, reslen); - if (retval != ERROR_OK) - return retval; - if (memchr(result, '\n', reslen) == NULL) - tcl_output(connection, "\n", 1); - } - tclc->tc_lineoffset = 0; - tclc->tc_linedrop = 0; - } - - return ERROR_OK; + } + else { + tclc->tc_line[tclc->tc_lineoffset-1] = '\0'; + LOG_DEBUG("Executing script:\n %s", tclc->tc_line); + retval = Jim_Eval_Named(interp, tclc->tc_line, "remote:connection",1); + LOG_DEBUG("Result: %d\n %s", retval, Jim_GetString(Jim_GetResult(interp), &reslen)); + result = Jim_GetString(Jim_GetResult(interp), &reslen); + retval = tcl_output(connection, result, reslen); + if (retval != ERROR_OK) + return retval; + /* Always output ctrl-d as end of line to allow multiline results */ + tcl_output(connection, "\x1a", 1); + } + + tclc->tc_lineoffset = 0; + tclc->tc_linedrop = 0; + } + + return ERROR_OK; } -static int tcl_closed(connection_t *connection) +static int tcl_closed(struct connection *connection) { - /* cleanup connection context */ - if (connection->priv) { - free(connection->priv); - connection->priv = NULL; - } - return ERROR_OK; + /* cleanup connection context */ + if (connection->priv) { + free(connection->priv); + connection->priv = NULL; + } + return ERROR_OK; } int tcl_init(void) { - int retval; - - if (tcl_port == 0) - { - LOG_WARNING("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); - return retval; + int retval; + + if (tcl_port == 0) + { + LOG_INFO("tcl port disabled"); + return ERROR_OK; + } + + 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) +COMMAND_HANDLER(handle_tcl_port_command) { - register_command(cmd_ctx, NULL, "tcl_port", handle_tcl_port_command, COMMAND_CONFIG, ""); - return ERROR_OK; + return CALL_COMMAND_HANDLER(server_port_command, &tcl_port); } -static int handle_tcl_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static const struct command_registration tcl_command_handlers[] = { + { + .name = "tcl_port", + .handler = handle_tcl_port_command, + .mode = COMMAND_CONFIG, + .help = "Specify port on which to listen " + "for incoming Tcl syntax. " + "No arguments reports Tcl port; zero disables.", + .usage = "[port_num]", + }, + COMMAND_REGISTRATION_DONE +}; + +int tcl_register_commands(struct command_context *cmd_ctx) { - if (argc == 1) { - tcl_port = strtoul(args[0], NULL, 0); - } - return ERROR_OK; + return register_commands(cmd_ctx, NULL, tcl_command_handlers); }