/***************************************************************************
- * 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 *
#include "config.h"
#endif
-#include "replacements.h"
-
-#include "server.h"
-
-#include "log.h"
#include "telnet_server.h"
#include "target.h"
-#include <command.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
+#include <microhttpd.h>
+#include <pthread.h>
#include <signal.h>
-#include <sys/types.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <microhttpd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#define PAGE_NOT_FOUND "<html><head><title > File not found</title></head><body > File not found</body></html>"
-#define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
+int loadFile(const char *name, void **data, size_t *len);
static const char *appendf(const char *prev, const char *format, ...)
{
t = appendf(t, "Runtime error, file \"%s\", line %d:<br>",
interp->errorFileName, interp->errorLine);
- t = appendf(t, " %s<br>", 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)
{
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<br>",
+ t = appendf(t, "In procedure '%s' called at file \"%s\", line %s < br>",
proc, file, line);
}
t = appendf(t, "</html></body>\n");
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;
int argc,
Jim_Obj *const *argv)
{
- if (argc!=2)
+ if (argc != 2)
{
Jim_WrongNumArgs(interp, 1, argv, "method ?args ...?");
return JIM_ERR;
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)
{
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;
return MHD_YES;
}
-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 handle_request(struct MHD_Connection * connection, const char * url)
{
struct MHD_Response * response;
+
int ret;
+ const char *suffix;
+ suffix = strrchr(url, '.');
+ if ((suffix != NULL) && (strcmp(suffix, ".tcl") == 0))
+ {
+ printf("Run tcl %s\n", url);
+
+ int retcode;
+
+ const char *script = alloc_printf(
+ "global httpdata; source {%s}; set httpdata", url);
+ retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__);
+ free((void *) script);
+
+ if (retcode == JIM_ERR)
+ {
+ printf("Tcl failed\n");
+ const char *t = httpd_exec_cgi_tcl_error(interp);
+ if (t == NULL)
+ return MHD_NO;
+
+ response = MHD_create_response_from_data(strlen(t), (void *) t,
+ MHD_YES, MHD_NO);
+ ret = MHD_queue_response(connection,
+ MHD_HTTP_INTERNAL_SERVER_ERROR, response);
+ MHD_destroy_response(response);
+ return ret;
+ }
+ else
+ {
+ LOG_DEBUG("Tcl OK");
+ /* FIX!!! how to handle mime types??? */
+ const char *result;
+ int reslen;
+ result = Jim_GetString(Jim_GetResult(interp), &reslen);
+
+ response = MHD_create_response_from_data(reslen, (void *) result,
+ MHD_NO, MHD_YES);
+ ret = MHD_queue_response(connection,
+ MHD_HTTP_INTERNAL_SERVER_ERROR, response);
+ MHD_destroy_response(response);
+ return ret;
+ }
+ }
+ else
+ {
+ void *data;
+ size_t len;
+
+ int retval = loadFile(url, &data, &len);
+ if (retval != ERROR_OK)
+ {
+ printf("Did not find %s\n", url);
+
+ response = MHD_create_response_from_data(strlen(PAGE_NOT_FOUND),
+ (void *) PAGE_NOT_FOUND, MHD_NO, MHD_NO);
+ ret = MHD_queue_response(connection, MHD_HTTP_NOT_FOUND, response);
+ MHD_destroy_response(response);
+ return ret;
+ }
+ 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");
+
+ ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+ MHD_destroy_response(response);
+
+ //free(data);
+ return ret;
+ }
+}
+
+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 post = 0;
if (0 == strcmp(method, "POST"))
if (r->post)
{
r->postprocessor = MHD_create_post_processor(connection, 2048
- * 1024, iterate_post, r);
+ * 1024, &iterate_post, r);
}
return MHD_YES;
* being subverted to evil purposes
*/
- url++; /* skip '/' */
+ const char *httpd_dir = PKGDATADIR "/httpd";
- const char *suffix;
- suffix = strrchr(url, '.');
- if ((suffix != NULL) && (strcmp(suffix, ".tcl") == 0))
+ if (*url=='/')
{
- printf("Run tcl %s\n", url);
-
- int retcode;
-
- const char *script = alloc_printf(
- "global httpdata; source {%s}; set httpdata", url);
- retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ );
- free((void *) script);
-
- if (retcode == JIM_ERR)
- {
- printf("Tcl failed\n");
- const char *t = httpd_exec_cgi_tcl_error(interp);
- if (t == NULL)
- return MHD_NO;
-
- response = MHD_create_response_from_data(strlen(t), (void *) t,
- MHD_YES, MHD_NO);
- ret = MHD_queue_response(connection,
- MHD_HTTP_INTERNAL_SERVER_ERROR, response);
- MHD_destroy_response(response);
- return ret;
- }
- else
- {
- printf("Tcl OK\n");
- /* FIX!!! how to handle mime types??? */
- const char *result;
- int reslen;
- result = Jim_GetString(Jim_GetResult(interp), &reslen);
-
- response = MHD_create_response_from_data(reslen, (void *) result,
- MHD_NO, MHD_YES);
- ret = MHD_queue_response(connection,
- MHD_HTTP_INTERNAL_SERVER_ERROR, response);
- MHD_destroy_response(response);
- return ret;
- }
+ url++; /* skip '/' */
}
- else
- {
- void *data;
- int len;
-
- int retval = loadFile(url, &data, &len);
- if (retval != ERROR_OK)
- {
- printf("Did not find %s\n", url);
-
- response = MHD_create_response_from_data(strlen(PAGE_NOT_FOUND),
- (void *) PAGE_NOT_FOUND, MHD_NO, MHD_NO);
- ret = MHD_queue_response(connection, MHD_HTTP_NOT_FOUND, response);
- MHD_destroy_response(response);
- return ret;
- }
-
- printf("Serving %s length=%d\n", 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");
-
- ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
- MHD_destroy_response(response);
+ if (!*url)
+ url="index.tcl";
- //free(data);
- return ret;
- }
+ 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 struct MHD_Daemon * d;
+static pthread_mutex_t mutex;
+
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);
void httpd_stop(void)
{
MHD_stop_daemon(d);
+ pthread_mutex_destroy(&mutex);
}
void openocd_sleep_prelude(void)
{
- /* FIX!!!! add locking here!!!! */
+ pthread_mutex_unlock(&mutex);
}
void openocd_sleep_postlude(void)
{
- /* FIX!!!! add locking here!!!! */
+ pthread_mutex_lock(&mutex);
}
Code Review / openocd.git / blobdiff