work in progress to hook up libmicrohttpd + tcl integration

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

diff --git a/configure.in b/configure.in
index 8889db4cac0ef169a92f42d72326b129c3831f1e..642be2ede8d0ab91e10297e426875f9477601f80 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -71,6 +71,10 @@ AC_ARG_ENABLE(ioutil,
   AS_HELP_STRING([--enable-ioutil], [Enable ioutil functions - useful for standalone OpenOCD implementations]), 
   [build_ioutil=$enableval], [build_ioutil=no])
 
+AC_ARG_ENABLE(httpd,
+  AS_HELP_STRING([--enable-httpd], [Enable builtin httpd server - useful for standalone OpenOCD implementations]), 
+  [build_httpd=$enableval], [build_httpd=no])
+
 case "${host_cpu}" in 
   arm*)
     AC_ARG_ENABLE(ep93xx,
@@ -189,6 +193,12 @@ else
   AC_DEFINE(BUILD_IOUTIL, 0, [0 if you don't want ioutils.])
 fi
 
+if test $build_httpd = yes; then
+  AC_DEFINE(BUILD_HTTPD, 1, [1 if you want httpd.])
+else
+  AC_DEFINE(BUILD_HTTPD, 0, [0 if you don't want httpd.])
+fi
+
 if test $build_at91rm9200 = yes; then
   build_bitbang=yes
   AC_DEFINE(BUILD_AT91RM9200, 1, [1 if you want at91rm9200.])
@@ -285,6 +295,7 @@ AM_CONDITIONAL(GIVEIO, test $parport_use_giveio = yes)
 AM_CONDITIONAL(EP93XX, test $build_ep93xx = yes)
 AM_CONDITIONAL(ECOSBOARD, test $build_ecosboard = yes)
 AM_CONDITIONAL(IOUTIL, test $build_ioutil = yes)
+AM_CONDITIONAL(HTTPD, test $build_httpd = yes)
 AM_CONDITIONAL(AT91RM9200, test $build_at91rm9200 = yes)
 AM_CONDITIONAL(BITBANG, test $build_bitbang = yes)
 AM_CONDITIONAL(FT2232_LIBFTDI, test $build_ft2232_libftdi = yes)

diff --git a/src/Makefile.am b/src/Makefile.am
index 669720f9e6fbd934155b9a54376d6f3e219207db..7574e84aa32bb370c9a6c2011a0e9ef6171c4e79 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,6 +79,13 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
        $(top_builddir)/src/pld/libpld.a \
        $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
 
+
+if HTTPD
+openocd_LDADD += -lmicrohttpd
+endif
+
+
+
 nobase_dist_pkglib_DATA = \
        tcl/bitsbytes.tcl                       \
        tcl/chip/atmel/at91/aic.tcl             \

diff --git a/src/main.c b/src/main.c
index b7be8970b81c9df7a9c8d8f99754c5b00e9867ea..c2f30035f36916e5babf2002d72f2c9dff1556a8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -18,6 +18,12 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if !BUILD_HTTPD
 /* implementations of OpenOCD that uses multithreading needs to know when
  * OpenOCD is sleeping. No-op in vanilla OpenOCD
  */
@@ -28,13 +34,14 @@ void openocd_sleep_prelude(void)
 void openocd_sleep_postlude(void)
 {
 }
+#endif
 
 /* This is the main entry for developer PC hosted OpenOCD.
  *
  * OpenOCD can also be used as a library that is linked with
  * another application(not mainstream yet, but possible), e.g.
  * w/as an embedded application.
- * 
+ *
  * Those applications will have their own main() implementation
  * and use bits and pieces from openocd.c. */
 

diff --git a/src/openocd.c b/src/openocd.c
index 014433c76f1600e63a22125c746ea449f291466c..471a097a4bf09307704c7883e6b96dbc2d3883fc 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -229,6 +229,9 @@ command_context_t *setup_command_handler(void)
        return cmd_ctx;
 }
 
+int httpd_start(void);
+void httpd_stop(void);
+
 /* normally this is the main() function entry, but if OpenOCD is linked
  * into application, then this fn will not be invoked, but rather that
  * application will have it's own implementation of main(). */
@@ -255,6 +258,11 @@ int openocd_main(int argc, char *argv[])
        if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
                return EXIT_FAILURE;
 
+#if BUILD_HTTPD
+       if (httpd_start()!=ERROR_OK)
+               return EXIT_FAILURE;
+#endif
+
        if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
        {
                command_context_mode(cmd_ctx, COMMAND_EXEC);
@@ -268,10 +276,15 @@ int openocd_main(int argc, char *argv[])
        /* shut server down */
        server_quit();
 
+#if BUILD_HTTPD
+       httpd_stop();
+#endif
+
        unregister_all_commands(cmd_ctx);
 
        /* free commandline interface */
        command_done(cmd_ctx);
 
+
        return EXIT_SUCCESS;
 }

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 63bcc04300796379b8d41a200c601c631bf2b047..0e3a3a479076178e7c9512d8367898c89fe83b83 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -4,6 +4,11 @@ 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
 
+if HTTPD
+libserver_a_SOURCES += httpd.c
+endif
+
+
 # tcl server addons
 noinst_HEADERS += tcl_server.h
 libserver_a_SOURCES += tcl_server.c

diff --git a/src/server/httpd.c b/src/server/httpd.c
new file mode 100644 (file)
index 0000000..f24e58a
--- /dev/null
+++ b/src/server/httpd.c
@@ -0,0 +1,455 @@
+/***************************************************************************\r
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *\r
+ *   oyvind.harboe@zylin.com                                               *\r
+ *                                                                         *\r
+ *   Copyright (C) 2008 Free Software Foundation\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
+/* some bits were copied from ahttpd which is under eCos license and\r
+ * copyright to FSF\r
+ */\r
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif\r
+\r
+#include "replacements.h"\r
+\r
+#include "server.h"\r
+\r
+#include "log.h"\r
+#include "telnet_server.h"\r
+#include "target.h"\r
+\r
+#include <command.h>\r
+#include <string.h>\r
+#include <stdlib.h>\r
+#include <errno.h>\r
+#include <unistd.h>\r
+#include <sys/types.h>\r
+#include <fcntl.h>\r
+#include <signal.h>\r
+\r
+#include <sys/types.h>\r
+#include <sys/select.h>\r
+#include <sys/socket.h>\r
+#include <microhttpd.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+#include <stdio.h>\r
+\r
+#define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"\r
+\r
+static const char *appendf(const *prev, const char *format, ...)\r
+{\r
+       va_list ap;\r
+       va_start(ap, format);\r
+       char *string = alloc_vprintf(format, ap);\r
+       va_end(ap);\r
+       char *string2 = NULL;\r
+\r
+       if (string != NULL)\r
+       {\r
+               string2 = alloc_printf("%s%s", (prev == NULL) ? "" : prev, string);\r
+       }\r
+\r
+       if (prev != NULL)\r
+       {\r
+               free(prev);\r
+       }\r
+\r
+       if (string == NULL)\r
+               free(string);\r
+\r
+       return string2;\r
+}\r
+\r
+static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp)\r
+{\r
+       int len, i;\r
+\r
+       const char *t = NULL;\r
+       t = appendf(t, "<html><body>\n");\r
+\r
+       t = appendf(t, "Runtime error, file \"%s\", line %d:<br>",\r
+                       interp->errorFileName, interp->errorLine);\r
+       t = appendf(t, "    %s<br>", Jim_GetString(interp->result, NULL));\r
+       Jim_ListLength(interp, interp->stackTrace, &len);\r
+       for (i = 0; i < len; i += 3)\r
+       {\r
+               Jim_Obj *objPtr;\r
+               const char *proc, *file, *line;\r
+\r
+               Jim_ListIndex(interp, interp->stackTrace, i, &objPtr, JIM_NONE);\r
+               proc = Jim_GetString(objPtr, NULL);\r
+               Jim_ListIndex(interp, interp->stackTrace, i + 1, &objPtr, JIM_NONE);\r
+               file = Jim_GetString(objPtr, NULL);\r
+               Jim_ListIndex(interp, interp->stackTrace, i + 2, &objPtr, JIM_NONE);\r
+               line = Jim_GetString(objPtr, NULL);\r
+               t = appendf(t, "In procedure '%s' called at file \"%s\", line %s<br>",\r
+                               proc, file, line);\r
+       }\r
+       t = appendf(t, "</html></body>\n");\r
+\r
+       return t;\r
+}\r
+\r
+static int httpd_Jim_Command_writeform(Jim_Interp *interp, int argc,\r
+               Jim_Obj * const *argv)\r
+{\r
+       if (argc != 3)\r
+       {\r
+               Jim_WrongNumArgs(interp, 1, argv, "method ?args ...?");\r
+               return JIM_ERR;\r
+       }\r
+       char *name = (char*) Jim_GetString(argv[1], NULL);\r
+       char *file = (char*) Jim_GetString(argv[2], NULL);\r
+\r
+       // Find length\r
+       char *data;\r
+       int actual;\r
+\r
+       int retcode;\r
+\r
+       const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val",\r
+                       name);\r
+       retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ );\r
+       free((void *) script);\r
+       if (retcode != JIM_OK)\r
+               return retcode;\r
+\r
+       data = Jim_GetString(Jim_GetResult(interp), &actual);\r
+\r
+       FILE *f;\r
+       f = fopen(file, "wb");\r
+       if (f != NULL)\r
+       {\r
+               int ok;\r
+               ok = fwrite(data, 1, actual, f) == actual;\r
+               fclose(f);\r
+\r
+               if (!ok)\r
+               {\r
+                       Jim_SetResultString(interp, "Could not write to file", -1);\r
+                       return JIM_ERR;\r
+               }\r
+       }\r
+       else\r
+       {\r
+               Jim_SetResultString(interp, "Could not create file", -1);\r
+               return JIM_ERR;\r
+       }\r
+       return JIM_OK;\r
+}\r
+\r
+\r
+int\r
+httpd_Jim_Command_formfetch(Jim_Interp *interp,\r
+                                   int argc,\r
+                                   Jim_Obj *const *argv)\r
+{\r
+    if (argc!=2)\r
+    {\r
+        Jim_WrongNumArgs(interp, 1, argv, "method ?args ...?");\r
+        return JIM_ERR;\r
+    }\r
+    char *name = (char*)Jim_GetString(argv[1], NULL);\r
+\r
+\r
+    const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val",\r
+                       name);\r
+       int retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ );\r
+       free((void *) script);\r
+       if (retcode != JIM_OK)\r
+               return retcode;\r
+\r
+    Jim_SetResult(interp, Jim_GetResult(interp));\r
+    return JIM_OK;\r
+}\r
+\r
+struct httpd_request\r
+{\r
+       int post;\r
+       struct MHD_PostProcessor *postprocessor;\r
+\r
+       //Jim_Obj *dict;\r
+\r
+       int complete; /* did we receive the entire post ? */\r
+\r
+};\r
+\r
+static void request_completed(void *cls, struct MHD_Connection *connection,\r
+               void **con_cls, enum MHD_RequestTerminationCode toe)\r
+{\r
+       struct httpd_request *r = (struct httpd_request*) *con_cls;\r
+\r
+       if (NULL == r)\r
+               return;\r
+\r
+       if (r->postprocessor)\r
+       {\r
+               MHD_destroy_post_processor(r->postprocessor);\r
+       }\r
+\r
+       free(r);\r
+       *con_cls = NULL;\r
+}\r
+\r
+/* append to said key in dictonary */\r
+static void append_key(struct httpd_request *r, const char *key,\r
+               const char *data, size_t off, size_t size)\r
+{\r
+       Jim_Obj *keyObj = Jim_NewStringObj(interp, key, -1);\r
+       Jim_Obj *value = NULL;\r
+\r
+       Jim_Obj *dict = Jim_GetVariableStr(interp, "httppostdata", 0);\r
+\r
+       if (dict!=NULL)\r
+       {\r
+               if (Jim_DictKey(interp, dict, keyObj, &value, 0) != JIM_OK)\r
+               {\r
+                        value = NULL;\r
+               }\r
+       }\r
+       if (value == NULL)\r
+               value = Jim_NewStringObj(interp, "", -1);\r
+\r
+       /* create a new object we append to and insert into this location */\r
+       Jim_Obj *newObj = Jim_NewStringObj(interp, "", -1);\r
+       Jim_AppendObj(interp, newObj, value);\r
+       Jim_AppendString(interp, newObj, data, size);\r
+       /* uhh... use name here of dictionary */\r
+       Jim_SetDictKeysVector(interp, Jim_NewStringObj(interp, "httppostdata", -1), &keyObj, 1, newObj);\r
+}\r
+\r
+/* append data to each key */\r
+static int iterate_post(void *con_cls, enum MHD_ValueKind kind,\r
+               const char *key, const char *filename, const char *content_type,\r
+               const char *transfer_encoding, const char *data, size_t off,\r
+               size_t size)\r
+{\r
+       struct httpd_request *r = (struct httpd_request*) con_cls;\r
+\r
+       append_key(r, key, data, off, size);\r
+\r
+       return MHD_YES;\r
+}\r
+\r
+static int record_arg(void *cls, enum MHD_ValueKind kind, const char *key,\r
+               const char *value)\r
+{\r
+       struct httpd_request *r = (struct httpd_request*) cls;\r
+       append_key(r, key, value, 0, strlen(value));\r
+       return MHD_YES;\r
+}\r
+\r
+static int ahc_echo(void * cls, struct MHD_Connection * connection,\r
+               const char * url, const char * method, const char * version,\r
+               const char * upload_data, unsigned int * upload_data_size, void ** ptr)\r
+{\r
+       struct MHD_Response * response;\r
+       int ret;\r
+\r
+       int post = 0;\r
+\r
+       if (0 == strcmp(method, "POST"))\r
+       {\r
+               post = 1;\r
+       }\r
+       else if (0 == strcmp(method, "GET"))\r
+       {\r
+       }\r
+       else\r
+       {\r
+               return MHD_NO; /* unexpected method */\r
+       }\r
+\r
+       struct httpd_request *r;\r
+       if (*ptr == NULL)\r
+       {\r
+               /* The first time only the headers are valid,\r
+                do not respond in the first round... */\r
+\r
+               *ptr = malloc(sizeof(struct httpd_request));\r
+               if (*ptr == NULL)\r
+                       return MHD_NO;\r
+               memset(*ptr, 0, sizeof(struct httpd_request));\r
+\r
+               r = (struct httpd_request *) *ptr;\r
+\r
+               r->post = post;\r
+\r
+//             r->dict = Jim_NewDictObj(interp, NULL, 0);\r
+\r
+               /* fill in url query strings in dictonary */\r
+               MHD_get_connection_values(connection, MHD_GET_ARGUMENT_KIND,\r
+                               record_arg, r);\r
+\r
+               if (r->post)\r
+               {\r
+                       r->postprocessor = MHD_create_post_processor(connection, 2048\r
+                                       * 1024, iterate_post, r);\r
+               }\r
+\r
+               return MHD_YES;\r
+       }\r
+\r
+       r = (struct httpd_request *) *ptr;\r
+\r
+       if (r->post)\r
+       {\r
+               /* consume post data */\r
+               if (*upload_data_size)\r
+               {\r
+                       MHD_post_process(r->postprocessor, upload_data, *upload_data_size);\r
+                       *upload_data_size = 0;\r
+                       return MHD_YES;\r
+               }\r
+               else\r
+               {\r
+               }\r
+       } else\r
+       {\r
+       }\r
+\r
+       /* hand over to request who will be using it. */\r
+       //Jim_SetGlobalVariableStr(interp, "httppostdata", Jim_GetVariableStr(interp, "httppostdata", 0));\r
+       //      r->dict = NULL;\r
+\r
+\r
+       /* FIX!!!! we need more advanced handling of url's to avoid them\r
+        * being subverted to evil purposes\r
+        */\r
+\r
+       url++; /* skip '/' */\r
+\r
+       const char *suffix;\r
+       suffix = strrchr(url, '.');\r
+       if ((suffix != NULL) && (strcmp(suffix, ".tcl") == 0))\r
+       {\r
+               printf("Run tcl %s\n", url);\r
+\r
+               int retcode;\r
+\r
+               const char *script = alloc_printf(\r
+                               "global httpdata; source {%s}; set httpdata", url);\r
+               retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ );\r
+               free((void *) script);\r
+\r
+               if (retcode == JIM_ERR)\r
+               {\r
+                       printf("Tcl failed\n");\r
+                       const char *t = httpd_exec_cgi_tcl_error(interp);\r
+                       if (t == NULL)\r
+                               return MHD_NO;\r
+\r
+                       response = MHD_create_response_from_data(strlen(t), (void *) t,\r
+                                       MHD_YES, MHD_NO);\r
+                       ret = MHD_queue_response(connection,\r
+                                       MHD_HTTP_INTERNAL_SERVER_ERROR, response);\r
+                       MHD_destroy_response(response);\r
+                       return ret;\r
+               }\r
+               else\r
+               {\r
+                       printf("Tcl OK\n");\r
+                       /* FIX!!! how to handle mime types??? */\r
+                       const char *result;\r
+                       int reslen;\r
+                       result = Jim_GetString(Jim_GetResult(interp), &reslen);\r
+\r
+                       response = MHD_create_response_from_data(reslen, (void *) result,\r
+                                       MHD_NO, MHD_YES);\r
+                       ret = MHD_queue_response(connection,\r
+                                       MHD_HTTP_INTERNAL_SERVER_ERROR, response);\r
+                       MHD_destroy_response(response);\r
+                       return ret;\r
+               }\r
+       }\r
+       else\r
+       {\r
+               void *data;\r
+               int len;\r
+\r
+               int retval = loadFile(url, &data, &len);\r
+               if (retval != ERROR_OK)\r
+               {\r
+                       printf("Did not find %s\n", url);\r
+\r
+                       response = MHD_create_response_from_data(strlen(PAGE_NOT_FOUND),\r
+                                       (void *) PAGE_NOT_FOUND, MHD_NO, MHD_NO);\r
+                       ret = MHD_queue_response(connection, MHD_HTTP_NOT_FOUND, response);\r
+                       MHD_destroy_response(response);\r
+                       return ret;\r
+               }\r
+\r
+               printf("Serving %s length=%d\n", url, len);\r
+               /* serve file directly */\r
+               response = MHD_create_response_from_data(len, data, MHD_YES, MHD_NO);\r
+               MHD_add_response_header(response, "Content-Type", "image/png");\r
+\r
+               ret = MHD_queue_response(connection, MHD_HTTP_OK, response);\r
+               MHD_destroy_response(response);\r
+\r
+               //free(data);\r
+               return ret;\r
+       }\r
+}\r
+\r
+static struct MHD_Daemon * d;\r
+\r
+int httpd_start(void)\r
+{\r
+\r
+       int port = 8888;\r
+       LOG_USER("Launching httpd server on port %d", port);\r
+       d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, port, NULL, NULL,\r
+                       &ahc_echo, NULL, /* could be data for handler, but we only have a single handler, use global variables instead */\r
+                       MHD_OPTION_NOTIFY_COMPLETED, request_completed, NULL, /* Closure... what's that??? */\r
+                       MHD_OPTION_END);\r
+       if (d == NULL)\r
+               return ERROR_FAIL;\r
+\r
+       Jim_CreateCommand(interp,\r
+                                                 "formfetch",\r
+                                                 httpd_Jim_Command_formfetch,\r
+                                                 NULL,\r
+                                                 NULL);\r
+\r
+    Jim_CreateCommand(interp,\r
+                      "writeform",\r
+                      httpd_Jim_Command_writeform,\r
+                      NULL,\r
+                      NULL);\r
+\r
+\r
+       return ERROR_OK;\r
+}\r
+\r
+void httpd_stop(void)\r
+{\r
+       MHD_stop_daemon(d);\r
+}\r
+\r
+void openocd_sleep_prelude(void)\r
+{\r
+}\r
+\r
+void openocd_sleep_postlude(void)\r
+{\r
+}\r
+\r