Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
- Fixes '[<>]' whitespace
[openocd.git] / src / server / httpd.c
diff --git a/src/server/httpd.c b/src/server/httpd.c
index 103c92f03d1ce118af6a54a7430cbc13d65d12a5..a3137d90a1359645163a78259543df9e431b1372 100644 (file)
--- a/src/server/httpd.c
+++ b/src/server/httpd.c
@@ -27,32 +27,16 @@
 #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, ...)
 {
@@ -87,7 +71,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp)
 
        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)
        {
@@ -100,7 +84,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<br>",
+               t = appendf(t, "In procedure '%s' called at file \"%s\", line %s < br>",
                                proc, file, line);
        }
        t = appendf(t, "</html></body>\n");
@@ -134,23 +118,19 @@ static int httpd_Jim_Command_writeform(Jim_Interp *interp, int argc,
 
        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 +142,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;
@@ -222,7 +202,7 @@ static void append_key(struct httpd_request *r, const char *key,
 
        Jim_Obj *dict = Jim_GetVariableStr(interp, "httppostdata", 0);
 
-       if (dict!=NULL)
+       if (dict != NULL)
        {
                if (Jim_DictKey(interp, dict, keyObj, &value, 0) != JIM_OK)
                {
@@ -243,7 +223,7 @@ static void append_key(struct httpd_request *r, const char *key,
 /* 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;
@@ -313,7 +293,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 +307,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");
@@ -381,7 +361,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 +393,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 +402,21 @@ 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 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);
@@ -461,15 +446,16 @@ int httpd_start(void)
 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 );
 }
 
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)