Support for APStreamline in APWeb

.gitignore

@@ -0,0 +1,3 @@
+*.o
+generated
+web_server

Makefile

@@ -1,7 +1,7 @@
 CC=gcc
-CFLAGS=-Wall -g -Werror
+CFLAGS=-Wall -g -Werror -std=gnu99
 
-SRC = $(wildcard *.c) $(wildcard lib/*.c) $(wildcard linux/*.c)
+SRC = $(wildcard *.c) $(wildcard lib/*.c) $(wildcard linux/*.c) $(wildcard posix/*.c)
 OBJ = $(SRC:%.c=%.o)
 LIBS = -ltalloc -lpthread
 
@@ -12,7 +12,7 @@ all: files/embedded.c mavlink web_server
 mavlink: generated/mavlink/ardupilotmega/mavlink.h
 
 generated/mavlink/ardupilotmega/mavlink.h:
-	mavgen.py --lang C ../mavlink/message_definitions/v1.0/ardupilotmega.xml -o generated/mavlink --wire-protocol=2.0
+	modules/mavlink/pymavlink/tools/mavgen.py --lang C modules/mavlink/message_definitions/v1.0/ardupilotmega.xml -o generated/mavlink --wire-protocol=2.0
 
 web_server: $(OBJ) files/embedded.c
 	$(CC) -o web_server $(OBJ) $(LIBS)

README.md

@@ -16,3 +16,8 @@ Some information on the JSON protocol used is here:
 
  https://docs.google.com/document/d/12IQFXDRIif06BiriHSCGdiJGZ6zsQ_phQsG_iI6_MAo/edit?usp=sharing
 
+ #### Build Notes
+ _Ubuntu 16.04_
+ - libtalloc-dev is required to build this project. You can install the required package with the following command: `sudo apt-get install libtalloc-dev`
+
+

cgi.c

@@ -21,6 +21,10 @@
 #include "includes.h"
 #include <ctype.h>
 
+#ifdef _POSIX_VERSION
+#include "posix/functions.h"
+#endif
+
 #define CONTENT_DISPOSITION "Content-Disposition:"
 #define CONTENT_TYPE "Content-Type:"
 #define MULTIPART_FORM_DATA "multipart/form-data"
@@ -430,6 +434,7 @@ static const struct mime_type {
     {".txt",  "text/plain", MIME_TYPE_TEXT_PLAIN},
     {".html", "text/html;charset=UTF-8",  MIME_TYPE_TEXT_HTML},
     {".mp4",  "video/mp4",  MIME_TYPE_VIDEO_MP4},
+    {".avi",  "video/avi",  MIME_TYPE_VIDEO_AVI},
     {".bin",  "data",       MIME_TYPE_UNKNOWN},
     {".svg",  "image/svg+xml", MIME_TYPE_IMAGE_SVG},
     {".js",   "application/javascript", MIME_TYPE_JAVASCRIPT},
@@ -588,13 +593,11 @@ static void download(struct cgi_state *cgi, const char *path)
 
     mtype = get_mime_type(path);
 
-#ifdef SYSTEM_FREERTOS
     if (strncmp(path, "fs/", 3) == 0) {
         download_filesystem(cgi, path);
         return;
     }
-#endif
-
+
     size_t size = 0;
     const char *contents = get_embedded_file(path, &size);
     if (!contents) {
@@ -649,6 +652,12 @@ static bool setup_standalone(struct cgi_state *cgi)
             cgi->content_length = atoi(&line[16]);
         } else if (strncasecmp(line,"Content-Type: ", 14)==0) {
             cgi->content_type = talloc_strdup(cgi, &line[14]);
+        } else if (strncasecmp(line,"Origin: ", 8)==0) {
+            cgi->origin = talloc_strdup(cgi, &line[8]);
+            if (cgi->check_origin != NULL && !cgi->check_origin(cgi->origin)) {
+                cgi->http_error(cgi, "400 Bad Origin", "",
+                                "request with incorrect origin header");                
+            }
         }
         /* ignore all other requests! */
     }

cgi.h

@@ -41,10 +41,12 @@ struct cgi_state {
                        const char *err, const char *header, const char *info);
     void (*download)(struct cgi_state *cgi, const char *path);
     void (*put)(struct cgi_state *cgi, const char *name, const char *value);
+    bool (*check_origin)(const char *origin);
 
     /* data */
     struct cgi_var *variables;
     struct template_state *tmpl;
+    const char *origin;
     char *content_type;
     unsigned long content_length;
     int request_post;
@@ -65,6 +67,7 @@ enum CGI_MIME_TYPE {MIME_TYPE_IMAGE_GIF,
                     MIME_TYPE_TEXT_PLAIN,
                     MIME_TYPE_TEXT_HTML,
                     MIME_TYPE_VIDEO_MP4,
+                    MIME_TYPE_VIDEO_AVI,
                     MIME_TYPE_JAVASCRIPT,
                     MIME_TYPE_JSON,
                     MIME_TYPE_CSS,

files/Makefile

@@ -1,6 +1,6 @@
 all:
 	@echo "Generating embedded.c"
-	@./embed.py *.html images/*.svg */*.js */*.json */*.css */*.jpg */*.png */*.mjpg data/*.xml
+	@./embed.py *.html images/*.svg */*.js */*.json */*.css */*.jpg */*.png */*.mjpg data/*.xml apsync/*.html
 	@echo "Generating manifest"
 	@./gen_manifest.sh
 	@echo "Generating version.h"