X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fhttpd.c;h=0ddeb97acc67b9cd7cd9718196be5c633bc0439e;hp=103c92f03d1ce118af6a54a7430cbc13d65d12a5;hb=f4fce92f28c7c5495929ad60ed24fda9f233d11a;hpb=e7485b930a62af8f420cbd82ec7d9ab53173b3c8 diff --git a/src/server/httpd.c b/src/server/httpd.c index 103c92f03d..0ddeb97acc 100644 --- a/src/server/httpd.c +++ b/src/server/httpd.c @@ -1,9 +1,7 @@ /*************************************************************************** - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008,2009 Øyvind Harboe * * oyvind.harboe@zylin.com * * * - * Copyright (C) 2008 Free Software Foundation - * * * 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 * * the Free Software Foundation; either version 2 of the License, or * @@ -27,32 +25,30 @@ #include "config.h" #endif -#include "replacements.h" - -#include "server.h" - -#include "log.h" #include "telnet_server.h" #include "target.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#define PAGE_NOT_FOUND " File not found File not found" + +static pthread_mutex_t mutex; + +void openocd_sleep_prelude(void) +{ + pthread_mutex_unlock(&mutex); +} + +void openocd_sleep_postlude(void) +{ + pthread_mutex_lock(&mutex); +} -#define PAGE_NOT_FOUND "File not foundFile not found" + + +int loadFile(const char *name, void **data, size_t *len); static const char *appendf(const char *prev, const char *format, ...) { @@ -87,7 +83,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp) t = appendf(t, "Runtime error, file \"%s\", line %d:
", interp->errorFileName, interp->errorLine); - t = appendf(t, " %s
", Jim_GetString(interp->result, NULL)); + t = appendf(t, " %s < br>", Jim_GetString(interp->result, NULL)); Jim_ListLength(interp, interp->stackTrace, &len); for (i = 0; i < len; i += 3) { @@ -100,7 +96,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp) file = Jim_GetString(objPtr, NULL); Jim_ListIndex(interp, interp->stackTrace, i + 2, &objPtr, JIM_NONE); line = Jim_GetString(objPtr, NULL); - t = appendf(t, "In procedure '%s' called at file \"%s\", line %s
", + t = appendf(t, "In procedure '%s' called at file \"%s\", line %s < br>", proc, file, line); } t = appendf(t, "\n"); @@ -127,30 +123,26 @@ static int httpd_Jim_Command_writeform(Jim_Interp *interp, int argc, const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val", name); - retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ ); + retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__); free((void *) script); if (retcode != JIM_OK) return retcode; data = Jim_GetString(Jim_GetResult(interp), &actual); - FILE *f; - f = fopen(file, "wb"); - if (f != NULL) + FILE *f = fopen(file, "wb"); + if (NULL == f) { - int ok; - ok = fwrite(data, 1, actual, f) == actual; - fclose(f); - - if (!ok) - { - Jim_SetResultString(interp, "Could not write to file", -1); - return JIM_ERR; - } + Jim_SetResultString(interp, "Could not create file", -1); + return JIM_ERR; } - else + + int result = fwrite(data, 1, actual, f); + fclose(f); + + if (result != actual) { - Jim_SetResultString(interp, "Could not create file", -1); + Jim_SetResultString(interp, "Could not write to file", -1); return JIM_ERR; } return JIM_OK; @@ -162,7 +154,7 @@ httpd_Jim_Command_formfetch(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { - if (argc!=2) + if (argc != 2) { Jim_WrongNumArgs(interp, 1, argv, "method ?args ...?"); return JIM_ERR; @@ -172,7 +164,7 @@ httpd_Jim_Command_formfetch(Jim_Interp *interp, const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val", name); - int retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ ); + int retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__); free((void *) script); if (retcode != JIM_OK) { @@ -206,7 +198,9 @@ static void request_completed(void *cls, struct MHD_Connection *connection, if (r->postprocessor) { + openocd_sleep_postlude(); MHD_destroy_post_processor(r->postprocessor); + openocd_sleep_prelude(); } free(r); @@ -218,32 +212,49 @@ static void append_key(struct httpd_request *r, const char *key, const char *data, size_t off, size_t size) { Jim_Obj *keyObj = Jim_NewStringObj(interp, key, -1); + Jim_IncrRefCount(keyObj); Jim_Obj *value = NULL; Jim_Obj *dict = Jim_GetVariableStr(interp, "httppostdata", 0); - if (dict!=NULL) + if (dict != NULL) { if (Jim_DictKey(interp, dict, keyObj, &value, 0) != JIM_OK) { value = NULL; } + else + { + Jim_IncrRefCount(value); + } } + if (value == NULL) + { value = Jim_NewStringObj(interp, "", -1); + Jim_IncrRefCount(value); + + } /* create a new object we append to and insert into this location */ Jim_Obj *newObj = Jim_NewStringObj(interp, "", -1); + Jim_IncrRefCount(newObj); Jim_AppendObj(interp, newObj, value); Jim_AppendString(interp, newObj, data, size); /* uhh... use name here of dictionary */ - Jim_SetDictKeysVector(interp, Jim_NewStringObj(interp, "httppostdata", -1), &keyObj, 1, newObj); + dict = Jim_NewStringObj(interp, "httppostdata", -1); + Jim_IncrRefCount(dict); + Jim_SetDictKeysVector(interp, dict, &keyObj, 1, newObj); + Jim_DecrRefCount(interp, dict); + Jim_DecrRefCount(interp, value); + Jim_DecrRefCount(interp, newObj); + Jim_DecrRefCount(interp, keyObj); } /* append data to each key */ static int iterate_post(void *con_cls, enum MHD_ValueKind kind, const char *key, const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, size_t off, + const char *transfer_encoding, const char *data, uint64_t off, size_t size) { struct httpd_request *r = (struct httpd_request*) con_cls; @@ -262,7 +273,7 @@ static int record_arg(void *cls, enum MHD_ValueKind kind, const char *key, } -int handle_request(struct MHD_Connection * connection, const char * url) +static int handle_request(struct MHD_Connection * connection, const char * url) { struct MHD_Response * response; @@ -277,7 +288,7 @@ int handle_request(struct MHD_Connection * connection, const char * url) const char *script = alloc_printf( "global httpdata; source {%s}; set httpdata", url); - retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ ); + retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__); free((void *) script); if (retcode == JIM_ERR) @@ -313,7 +324,7 @@ int handle_request(struct MHD_Connection * connection, const char * url) else { void *data; - int len; + size_t len; int retval = loadFile(url, &data, &len); if (retval != ERROR_OK) @@ -327,7 +338,7 @@ int handle_request(struct MHD_Connection * connection, const char * url) return ret; } - LOG_DEBUG("Serving %s length=%d", url, len); + LOG_DEBUG("Serving %s length=%zu", url, len); /* serve file directly */ response = MHD_create_response_from_data(len, data, MHD_YES, MHD_NO); MHD_add_response_header(response, "Content-Type", "image/png"); @@ -340,7 +351,7 @@ int handle_request(struct MHD_Connection * connection, const char * url) } } -static int ahc_echo(void * cls, struct MHD_Connection * connection, +static int ahc_echo_inner(void * cls, struct MHD_Connection * connection, const char * url, const char * method, const char * version, const char * upload_data, unsigned int * upload_data_size, void ** ptr) { @@ -381,7 +392,7 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection, if (r->post) { r->postprocessor = MHD_create_post_processor(connection, 2048 - * 1024, iterate_post, r); + * 1024, &iterate_post, r); } return MHD_YES; @@ -413,7 +424,7 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection, * being subverted to evil purposes */ - const char *httpd_dir=PKGLIBDIR "/httpd"; + const char *httpd_dir = PKGDATADIR "/httpd"; if (*url=='/') { @@ -422,16 +433,35 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection, if (!*url) url="index.tcl"; - const char *file_name=alloc_printf("%s/%s", httpd_dir, url); + const char *file_name = alloc_printf("%s/%s", httpd_dir, url); int result = handle_request(connection, file_name); free((void *)file_name); return result; } + +static int ahc_echo(void * cls, struct MHD_Connection * connection, + const char * url, const char * method, const char * version, + const char * upload_data, unsigned int * upload_data_size, void ** ptr) +{ + int result; + + openocd_sleep_postlude(); + + result = ahc_echo_inner(cls, connection, url, method, version, upload_data, upload_data_size, ptr); + + openocd_sleep_prelude(); + + return result; +} + static struct MHD_Daemon * d; int httpd_start(void) { + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + pthread_mutex_init(&mutex, &attr); int port = 8888; LOG_USER("Launching httpd server on port %d", port); @@ -461,15 +491,6 @@ int httpd_start(void) void httpd_stop(void) { MHD_stop_daemon(d); -} - -void openocd_sleep_prelude(void) -{ - /* FIX!!!! add locking here!!!! */ -} - -void openocd_sleep_postlude(void) -{ - /* FIX!!!! add locking here!!!! */ + pthread_mutex_destroy(&mutex); }