Implement FS virtualization

Author: cpq

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Install packages
       run: sudo apt-get install libmbedtls-dev
     - name: examples
-      run: make ex
+      run: make clean examples
   macos:
     runs-on: macos-latest
     steps:
@@ -49,3 +49,21 @@ jobs:
     - uses: actions/checkout@v2
     - name: arm
       run: make arm
+  esp32:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: esp32
+      run: make -C examples/esp32 build
+  esp8266:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: esp8266
+      run: make -C examples/esp8266 build
+  stm32-freertos-tcp:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: stm32-freertos-tcp
+      run: make -C examples/stm32-freertos-tcp build

Makefile

@@ -1,6 +1,6 @@
 SRCS = mongoose.c test/unit_test.c test/packed_fs.c
 HDRS = $(wildcard src/*.h)
-DEFS ?= -DMG_MAX_HTTP_HEADERS=5 -DMG_ENABLE_LINES -DMG_ENABLE_DIRECTORY_LISTING=1 -DMG_ENABLE_SSI=1
+DEFS ?= -DMG_MAX_HTTP_HEADERS=5 -DMG_ENABLE_LINES
 WARN ?= -W -Wall -Werror -Wshadow -Wdouble-promotion -fno-common -Wconversion
 OPTS ?= -O3 -g3
 INCS ?= -Isrc -I.
@@ -12,10 +12,9 @@ VCFLAGS = /nologo /W3 /O2 /I. $(DEFS) $(TFLAGS)
 IPV6 ?= 1
 ASAN_OPTIONS ?=
 EXAMPLES := $(wildcard examples/*)
-EXAMPLE_TARGET ?= example
 PREFIX ?= /usr/local
 SOVERSION = 7.4
-.PHONY: ex test
+.PHONY: examples test
 
 ifeq "$(SSL)" "MBEDTLS"
 MBEDTLS ?= /usr
@@ -28,10 +27,10 @@ CFLAGS  += -DMG_ENABLE_OPENSSL=1 -I$(OPENSSL)/include
 LDFLAGS ?= -L$(OPENSSL)/lib -lssl -lcrypto
 endif
 
-all: mg_prefix test test++ arm ex vc98 vc2017 mingw mingw++ linux linux++ fuzz
+all: mg_prefix test test++ arm examples vc98 vc2017 mingw mingw++ linux linux++ fuzz
 
-ex:
-	@for X in $(EXAMPLES); do $(MAKE) -C $$X $(EXAMPLE_TARGET) || break; done
+examples:
+	@for X in $(EXAMPLES); do $(MAKE) -C $$X example || break; done
 
 test/packed_fs.c:
 	$(CC) $(CFLAGS) examples/complete/pack.c -o pack
@@ -73,10 +72,10 @@ infer:
 	infer run -- cc test/unit_test.c -c -W -Wall -Werror -Isrc -I. -O2 -DMG_ENABLE_MBEDTLS=1 -DMG_ENABLE_LINES -I/usr/local/Cellar/mbedtls/2.23.0/include  -DMG_ENABLE_IPV6=1 -g -o /dev/null
 
 arm: mongoose.h $(SRCS)
-	$(DOCKER) mdashnet/armgcc arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb $(SRCS) test/mongoose_custom.c -Itest -DMG_ARCH=MG_ARCH_CUSTOM $(OPTS) $(WARN) $(INCS) -DMG_MAX_HTTP_HEADERS=5 -DMG_ENABLE_LINES -DMG_ENABLE_DIRECTORY_LISTING=0 -DMG_ENABLE_SSI=1 -o unit_test -nostartfiles --specs nosys.specs -e 0
+	$(DOCKER) mdashnet/armgcc arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb $(SRCS) test/mongoose_custom.c -Itest -DMG_ARCH=MG_ARCH_CUSTOM $(OPTS) $(WARN) $(INCS) -DMG_MAX_HTTP_HEADERS=5 -DMG_ENABLE_LINES=1 -o unit_test -nostartfiles --specs nosys.specs -e 0
 
 riscv: mongoose.h $(SRCS)
-	$(DOCKER) mdashnet/riscv riscv-none-elf-gcc -march=rv32imc -mabi=ilp32 $(SRCS) test/mongoose_custom.c -Itest -DMG_ARCH=MG_ARCH_CUSTOM $(OPTS) $(WARN) $(INCS) -DMG_MAX_HTTP_HEADERS=5 -DMG_ENABLE_LINES -DMG_ENABLE_DIRECTORY_LISTING=0 -DMG_ENABLE_SSI=1 -o unit_test
+	$(DOCKER) mdashnet/riscv riscv-none-elf-gcc -march=rv32imc -mabi=ilp32 $(SRCS) test/mongoose_custom.c -Itest -DMG_ARCH=MG_ARCH_CUSTOM $(OPTS) $(WARN) $(INCS) -DMG_MAX_HTTP_HEADERS=5 -DMG_ENABLE_LINES=1 -o unit_test
 
 #vc98: VCFLAGS += -DMG_ENABLE_IPV6=1
 vc98: Makefile mongoose.c mongoose.h test/unit_test.c
@@ -125,6 +124,6 @@ mongoose.c: Makefile $(wildcard src/*)
 mongoose.h: $(HDRS) Makefile
 	(cat src/license.h src/version.h ; cat src/config.h src/arch.h src/arch_*.h src/str.h src/log.h src/timer.h src/util.h src/fs.h src/url.h src/iobuf.h src/base64.h src/md5.h src/sha1.h src/event.h src/net.h src/http.h src/ssi.h src/tls.h src/ws.h src/sntp.h src/mqtt.h src/dns.h | sed -e 's,#include ".*,,' -e 's,^#pragma once,,'; echo; echo '#ifdef __cplusplus'; echo '}'; echo '#endif'; echo '#endif  // MONGOOSE_H')> $@
 
-clean: EXAMPLE_TARGET = clean
-clean: ex
+clean:
 	rm -rf $(PROG) *.o *.dSYM unit_test* ut fuzzer *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb slow-unit* _CL_* infer-out data.txt crash-* test/packed_fs.c pack
+	@for X in $(EXAMPLES); do $(MAKE) -C $$X clean; done

docs/README.md

@@ -204,7 +204,7 @@ option during build time, use the `-D OPTION` compiler flag:
 $ cc app0.c mongoose.c                                        # Use defaults!
 $ cc app1.c mongoose.c -D MG_ENABLE_IPV6=1                    # Build with IPv6 enabled
 $ cc app2.c mongoose.c -D MG_ARCH=MG_ARCH_FREERTOS_LWIP       # Set architecture
-$ cc app3.c mongoose.c -D MG_ENABLE_SSI=1 -D MG_ENABLE_LOG=0  # Multiple options
+$ cc app3.c mongoose.c -D MG_ENABLE_SSI=0 -D MG_ENABLE_LOG=0  # Multiple options
 ```
 
 The list of supported
@@ -240,12 +240,13 @@ Here is a list of build constants and their default values:
 |MG_ENABLE_IPV6 | 0 | Enable IPv6 |
 |MG_ENABLE_LOG | 1 | Enable `LOG()` macro |
 |MG_ENABLE_MD5 | 0 | Use native MD5 implementation |
-|MG_ENABLE_DIRECTORY_LISTING | 0 | Enable directory listing for HTTP server |
 |MG_ENABLE_SOCKETPAIR | 0 | Enable `mg_socketpair()` for multi-threading |
-|MG_ENABLE_SSI | 0 | Enable serving SSI files by `mg_http_serve_dir()` |
-|MG_IO_SIZE | 512 | Granularity of the send/recv IO buffer growth |
+|MG_ENABLE_SSI | 1 | Enable serving SSI files by `mg_http_serve_dir()` |
+|MG_ENABLE_DIRLIST | 0 | Enable directory listing |
+|MG_IO_SIZE | 2048 | Granularity of the send/recv IO buffer growth |
 |MG_MAX_RECV_BUF_SIZE | (3 * 1024 * 1024) | Maximum recv buffer size |
 |MG_MAX_HTTP_HEADERS | 40 | Maximum number of HTTP headers |
+|MG_ENABLE_LINES | undefined | If defined, show source file names in logs |
 
 
 NOTE: `MG_IO_SIZE` controls the maximum UDP message size, see
@@ -724,18 +725,20 @@ enable SSI, set a `-DMG_ENABLE_SSI=1` build flag.
 
 ```c
 void mg_http_serve_file(struct mg_connection *, struct mg_http_message *hm,
-                        const char *path, const char *mimetype,
-                        const char *extra_headers);
+                        const char *path, struct mg_http_serve_opts *opts);
 ```
 
 Serve static file. Note that the `extra_headers` must end with `\r\n`. Here
 is an example call:
 
 ```c
-mg_http_serve_file(c, hm, "a.png", "image/png", "AA: bb\r\nCC: dd\r\n");
+struct mg_http_serve_opts opts = {.mime_types = "png=image/png", 
+                                  .extra_headers = "AA: bb\r\nCC: dd\r\n"};
+mg_http_serve_file(c, hm, "a.png", &opts);
 ```
 
 
+
 ### mg\_http\_reply()
 
 ```c

examples/complete/Makefile

@@ -20,4 +20,4 @@ windows:
 	$(DOCKER) $(PROG).exe
 
 clean:
-	rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb log.txt fs.c pack
+	rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb log.txt packed_fs.c pack

examples/complete/main.c

@@ -119,7 +119,8 @@ static void cb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
           "Pragma: no-cache\r\nExpires: Thu, 01 Dec 1994 16:00:00 GMT\r\n"
           "Content-Type: multipart/x-mixed-replace; boundary=--foo\r\n\r\n");
     } else if (mg_http_match_uri(hm, "/api/log/static")) {
-      mg_http_serve_file(c, hm, "log.txt", "text/plain", "");
+      struct mg_http_serve_opts opts = {.root_dir = NULL};
+      mg_http_serve_file(c, hm, "log.txt", &opts);
     } else if (mg_http_match_uri(hm, "/api/log/live")) {
       c->label[0] = 'L';  // Mark that connection as live log listener
       mg_printf(c, "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n");

examples/esp32/Makefile

@@ -3,7 +3,10 @@ ROOTDIR = $(realpath $(CURDIR)/../..)
 
 all: example
 
-example: main/main.c Makefile
+example:
+	true
+
+build: main/main.c Makefile
 	docker run --rm -v $(ROOTDIR):$(ROOTDIR) -w $(THISDIR) espressif/idf idf.py build
 
 COMPORT ?= /dev/cu.SLAB_USBtoUART
@@ -12,4 +15,4 @@ flash:
 	cd build && $(ESPTOOL) --chip esp32 -p $(COMPORT) -b 460800 --before=default_reset --after=hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size 2MB 0x8000 partition_table/partition-table.bin 0x1000 bootloader/bootloader.bin 0x100000 mongoose-esp32-example.bin
 
 clean:
-	rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb mongoose mongoose_* mongoose.* build sdkconfig
+	rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb mongoose mongoose_* mongoose.* build sdkconfig build

examples/esp32/main/CMakeLists.txt

@@ -2,4 +2,4 @@ idf_component_register(SRCS "main.c"
                             "wifi.c"
                             "../../../mongoose.c"
                        INCLUDE_DIRS "../../..")
-component_compile_options(-DMG_ENABLE_DIRECTORY_LISTING=1 -DMG_ENABLE_LINES)
+component_compile_options(-DMG_ENABLE_LINES)

examples/esp8266/Makefile

@@ -3,8 +3,11 @@ ROOTDIR = $(realpath $(CURDIR)/../..)
 
 all: example
 
-example: src/main/main.c src/main/wifi.c Makefile
+example:
+	true
+
+build: src/main/main.c src/main/wifi.c Makefile
 	docker run --rm -v $(ROOTDIR):$(ROOTDIR) -w $(THISDIR) docker.io/mdashnet/8266 make -C src defconfig app
 
 clean:
-	rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb mongoose mongoose_* mongoose.* src/build src/sdkconfig
+	rm -rf build

examples/http-restful-server/Makefile

@@ -12,7 +12,7 @@ all: $(PROG)
 	$(DEBUGGER) ./$(PROG) $(ARGS)
 
 $(PROG): main.c
-	$(CC) ../../mongoose.c -I../.. -W -Wall -DMG_ENABLE_LINES=1 -DMG_ENABLE_DIRECTORY_LISTING=1 $(CFLAGS) -o $(PROG) main.c
+	$(CC) ../../mongoose.c -I../.. -W -Wall -DMG_ENABLE_LINES=1 $(CFLAGS) -o $(PROG) main.c
 
 clean:
 	rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb

examples/http-server/Makefile

@@ -1,6 +1,6 @@
 PROG ?= example
 ROOT ?= $(realpath $(CURDIR)/../..)
-DEFS ?= -DMG_ENABLE_LINES=1 -DMG_ENABLE_DIRECTORY_LISTING=1 -DMG_ENABLE_SSI=1
+DEFS ?= -DMG_ENABLE_LINES=1
 CFLAGS ?= -I../.. -W -Wall -DMG_ENABLE_IPV6=1 $(DEFS) $(EXTRA)
 VCFLAGS = /nologo /W3 /O2 /I../.. $(DEFS) $(EXTRA) /link /incremental:no /machine:IX86
 VC98 = docker run -it --rm -e Tmp=. -v $(ROOT):$(ROOT) -w $(CURDIR) mdashnet/vc98