From 4d3fba57d48b1f6a85229442eec2443d3e7b72fd Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Mon, 22 Jan 2024 14:48:01 -0300 Subject: [PATCH] rename MG_ENABLE_FILE to MG_ENABLE_POSIX_FS --- Makefile | 4 +- .../arduino/teensy41-http/mongoose_custom.h | 2 +- .../pico-rndis-dashboard/CMakeLists.txt | 2 +- .../rp2040/pico-rndis-device/CMakeLists.txt | 2 +- examples/rp2040/pico-w5500/CMakeLists.txt | 2 +- .../Core/Inc/mongoose_custom.h | 64 +- .../Core/Inc/mongoose_custom.h | 64 +- .../Core/Inc/mongoose_custom.h | 64 +- .../Core/Inc/mongoose_custom.h | 64 +- .../Core/Inc/mongoose_custom.h | 64 +- .../Core/Inc/mongoose_custom.h | 64 +- .../Core/Inc/mongoose_custom.h | 64 +- .../Core/Inc/mongoose_custom.h | 64 +- .../mongoose_custom.h | 2 +- mongoose.c | 568 +++++++++--------- mongoose.h | 6 +- src/config.h | 6 +- src/fs_posix.c | 2 +- 18 files changed, 554 insertions(+), 554 deletions(-) diff --git a/Makefile b/Makefile index 818a42cc..bb924fd5 100644 --- a/Makefile +++ b/Makefile @@ -132,11 +132,11 @@ s390: CC = $(DOCKER) mdashnet/s390 cc s390: RUN = $(DOCKER) mdashnet/s390 s390: test -arm: DEFS += -DMG_ENABLE_FILE=0 -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_NEWLIB +arm: DEFS += -DMG_ENABLE_POSIX_FS=0 -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_NEWLIB arm: mongoose.h $(SRCS) $(DOCKER) mdashnet/armgcc arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb $(SRCS) $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) -o unit_test -nostartfiles --specs nosys.specs -e 0 -riscv: DEFS += -DMG_ENABLE_FILE=0 -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_NEWLIB +riscv: DEFS += -DMG_ENABLE_POSIX_FS=0 -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_NEWLIB riscv: mongoose.h $(SRCS) $(DOCKER) mdashnet/riscv riscv-none-elf-gcc -march=rv32imc -mabi=ilp32 $(SRCS) $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) -o unit_test diff --git a/examples/arduino/teensy41-http/mongoose_custom.h b/examples/arduino/teensy41-http/mongoose_custom.h index 6dbd5094..9c6a33cc 100644 --- a/examples/arduino/teensy41-http/mongoose_custom.h +++ b/examples/arduino/teensy41-http/mongoose_custom.h @@ -4,7 +4,7 @@ #define MG_ENABLE_TCPIP 1 // Enable built-in network stack #define MG_ENABLE_DRIVER_IMXRT 1 // Enable RTxx driver #define MG_ENABLE_CUSTOM_MILLIS 1 // Let user implement mg_millis() -#define MG_ENABLE_FILE 0 // Disable POSIX filesystem +#define MG_ENABLE_POSIX_FS 0 // Disable POSIX filesystem #define MG_ENABLE_PACKED_FS 1 // Enable packed filesystem #define HTTP_URL "http://0.0.0.0" diff --git a/examples/rp2040/pico-rndis-dashboard/CMakeLists.txt b/examples/rp2040/pico-rndis-dashboard/CMakeLists.txt index 14545da3..d944ebfc 100644 --- a/examples/rp2040/pico-rndis-dashboard/CMakeLists.txt +++ b/examples/rp2040/pico-rndis-dashboard/CMakeLists.txt @@ -26,7 +26,7 @@ pico_enable_stdio_uart(firmware 1) # to the UART # Mongoose build flags add_definitions(-DMG_ENABLE_TCPIP=1) add_definitions(-DMG_ENABLE_PACKED_FS=1) -add_definitions(-DMG_ENABLE_FILE=0) +add_definitions(-DMG_ENABLE_POSIX_FS=0) add_definitions(-DDISABLE_ROUTING=1) # Example build options diff --git a/examples/rp2040/pico-rndis-device/CMakeLists.txt b/examples/rp2040/pico-rndis-device/CMakeLists.txt index a43355d1..200cbf38 100644 --- a/examples/rp2040/pico-rndis-device/CMakeLists.txt +++ b/examples/rp2040/pico-rndis-device/CMakeLists.txt @@ -23,6 +23,6 @@ pico_enable_stdio_uart(firmware 1) # to the UART # Mongoose build flags add_definitions(-DMG_ENABLE_TCPIP=1) -add_definitions(-DMG_ENABLE_FILE=0) +add_definitions(-DMG_ENABLE_POSIX_FS=0) # Example build options diff --git a/examples/rp2040/pico-w5500/CMakeLists.txt b/examples/rp2040/pico-w5500/CMakeLists.txt index 84fd7ac0..b076f8fe 100644 --- a/examples/rp2040/pico-w5500/CMakeLists.txt +++ b/examples/rp2040/pico-w5500/CMakeLists.txt @@ -21,7 +21,7 @@ add_definitions(-DMG_ENABLE_TCPIP=1) add_definitions(-DMG_ENABLE_PACKED_FS=1) add_definitions(-DMG_ENABLE_MBEDTLS=0) # TODO(cpq): enable add_definitions(-DMG_ENABLE_CUSTOM_RANDOM=1) -add_definitions(-DMG_ENABLE_FILE=0) +add_definitions(-DMG_ENABLE_POSIX_FS=0) # Example build options add_definitions(-DHTTP_URL="http://0.0.0.0/") diff --git a/examples/stm32/nucleo-f429zi-cube-baremetal-builtin/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f429zi-cube-baremetal-builtin/Core/Inc/mongoose_custom.h index 37217804..6cd87208 100644 --- a/examples/stm32/nucleo-f429zi-cube-baremetal-builtin/Core/Inc/mongoose_custom.h +++ b/examples/stm32/nucleo-f429zi-cube-baremetal-builtin/Core/Inc/mongoose_custom.h @@ -1,32 +1,32 @@ - -// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based -#if defined(MG_ARCH) -#define MG_STMPACK_ARCH MG_ARCH -#undef MG_ARCH -#elif defined(__GNUC__) -#define MG_STMPACK_ARCH MG_ARCH_NEWLIB -#endif - -#define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_CUSTOM_MILLIS 1 -#define MG_ENABLE_MBEDTLS 0 -#define MG_ARCH MG_STMPACK_ARCH -#define MG_STMPACK_NET 0 -#define MG_ENABLE_CUSTOM_RANDOM 1 - -// Translate to Mongoose macros -#if MG_CMSISPACK_NET == 0 -#define MG_ENABLE_TCPIP 1 -#elif MG_CMSISPACK_NET == 1 -#define MG_ENABLE_LWIP 1 -#elif MG_CMSISPACK_NET == 2 -#define MG_ENABLE_FREERTOS_TCP 1 -#elif MG_CMSISPACK_NET == 3 -#define MG_ENABLE_RL 1 -#endif - -#if MG_ENABLE_PACKED_FS -#define MG_ENABLE_FILE 0 -#endif - -// See https://mongoose.ws/documentation/#build-options + +// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based +#if defined(MG_ARCH) +#define MG_STMPACK_ARCH MG_ARCH +#undef MG_ARCH +#elif defined(__GNUC__) +#define MG_STMPACK_ARCH MG_ARCH_NEWLIB +#endif + +#define MG_ENABLE_PACKED_FS 1 +#define MG_ENABLE_CUSTOM_MILLIS 1 +#define MG_ENABLE_MBEDTLS 0 +#define MG_ARCH MG_STMPACK_ARCH +#define MG_STMPACK_NET 0 +#define MG_ENABLE_CUSTOM_RANDOM 1 + +// Translate to Mongoose macros +#if MG_CMSISPACK_NET == 0 +#define MG_ENABLE_TCPIP 1 +#elif MG_CMSISPACK_NET == 1 +#define MG_ENABLE_LWIP 1 +#elif MG_CMSISPACK_NET == 2 +#define MG_ENABLE_FREERTOS_TCP 1 +#elif MG_CMSISPACK_NET == 3 +#define MG_ENABLE_RL 1 +#endif + +#if MG_ENABLE_PACKED_FS +#define MG_ENABLE_POSIX_FS 0 +#endif + +// See https://mongoose.ws/documentation/#build-options diff --git a/examples/stm32/nucleo-f429zi-cube-freertos-builtin/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f429zi-cube-freertos-builtin/Core/Inc/mongoose_custom.h index 4c3dab86..956a921d 100644 --- a/examples/stm32/nucleo-f429zi-cube-freertos-builtin/Core/Inc/mongoose_custom.h +++ b/examples/stm32/nucleo-f429zi-cube-freertos-builtin/Core/Inc/mongoose_custom.h @@ -1,32 +1,32 @@ - -// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based -#if defined(MG_ARCH) -#define MG_STMPACK_ARCH MG_ARCH -#undef MG_ARCH -#elif defined(__GNUC__) -#define MG_STMPACK_ARCH MG_ARCH_NEWLIB -#endif - -#define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_CUSTOM_MILLIS 0 -#define MG_ENABLE_MBEDTLS 0 -#define MG_ARCH MG_ARCH_CMSIS_RTOS2 -#define MG_STMPACK_NET 0 -#define MG_ENABLE_CUSTOM_RANDOM 1 - -// Translate to Mongoose macros -#if MG_STMPACK_NET == 0 -#define MG_ENABLE_TCPIP 1 -#elif MG_STMPACK_NET == 1 -#define MG_ENABLE_LWIP 1 -#elif MG_STMPACK_NET == 2 -#define MG_ENABLE_FREERTOS_TCP 1 -#elif MG_STMPACK_NET == 3 -#define MG_ENABLE_RL 1 -#endif - -#if MG_ENABLE_PACKED_FS -#define MG_ENABLE_FILE 0 -#endif - -// See https://mongoose.ws/documentation/#build-options + +// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based +#if defined(MG_ARCH) +#define MG_STMPACK_ARCH MG_ARCH +#undef MG_ARCH +#elif defined(__GNUC__) +#define MG_STMPACK_ARCH MG_ARCH_NEWLIB +#endif + +#define MG_ENABLE_PACKED_FS 1 +#define MG_ENABLE_CUSTOM_MILLIS 0 +#define MG_ENABLE_MBEDTLS 0 +#define MG_ARCH MG_ARCH_CMSIS_RTOS2 +#define MG_STMPACK_NET 0 +#define MG_ENABLE_CUSTOM_RANDOM 1 + +// Translate to Mongoose macros +#if MG_STMPACK_NET == 0 +#define MG_ENABLE_TCPIP 1 +#elif MG_STMPACK_NET == 1 +#define MG_ENABLE_LWIP 1 +#elif MG_STMPACK_NET == 2 +#define MG_ENABLE_FREERTOS_TCP 1 +#elif MG_STMPACK_NET == 3 +#define MG_ENABLE_RL 1 +#endif + +#if MG_ENABLE_PACKED_FS +#define MG_ENABLE_POSIX_FS 0 +#endif + +// See https://mongoose.ws/documentation/#build-options diff --git a/examples/stm32/nucleo-f429zi-cube-freertos-lwip/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f429zi-cube-freertos-lwip/Core/Inc/mongoose_custom.h index f4238f40..b6a9622d 100644 --- a/examples/stm32/nucleo-f429zi-cube-freertos-lwip/Core/Inc/mongoose_custom.h +++ b/examples/stm32/nucleo-f429zi-cube-freertos-lwip/Core/Inc/mongoose_custom.h @@ -1,32 +1,32 @@ - -// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based -#if defined(MG_ARCH) -#define MG_STMPACK_ARCH MG_ARCH -#undef MG_ARCH -#elif defined(__GNUC__) -#define MG_STMPACK_ARCH MG_ARCH_NEWLIB -#endif - -#define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_CUSTOM_MILLIS 0 -#define MG_ENABLE_MBEDTLS 0 -#define MG_ARCH MG_ARCH_FREERTOS -#define MG_STMPACK_NET 1 -#define MG_ENABLE_CUSTOM_RANDOM 1 - -// Translate to Mongoose macros -#if MG_STMPACK_NET == 0 -#define MG_ENABLE_TCPIP 1 -#elif MG_STMPACK_NET == 1 -#define MG_ENABLE_LWIP 1 -#elif MG_STMPACK_NET == 2 -#define MG_ENABLE_FREERTOS_TCP 1 -#elif MG_STMPACK_NET == 3 -#define MG_ENABLE_RL 1 -#endif - -#if MG_ENABLE_PACKED_FS -#define MG_ENABLE_FILE 0 -#endif - -// See https://mongoose.ws/documentation/#build-options + +// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based +#if defined(MG_ARCH) +#define MG_STMPACK_ARCH MG_ARCH +#undef MG_ARCH +#elif defined(__GNUC__) +#define MG_STMPACK_ARCH MG_ARCH_NEWLIB +#endif + +#define MG_ENABLE_PACKED_FS 1 +#define MG_ENABLE_CUSTOM_MILLIS 0 +#define MG_ENABLE_MBEDTLS 0 +#define MG_ARCH MG_ARCH_FREERTOS +#define MG_STMPACK_NET 1 +#define MG_ENABLE_CUSTOM_RANDOM 1 + +// Translate to Mongoose macros +#if MG_STMPACK_NET == 0 +#define MG_ENABLE_TCPIP 1 +#elif MG_STMPACK_NET == 1 +#define MG_ENABLE_LWIP 1 +#elif MG_STMPACK_NET == 2 +#define MG_ENABLE_FREERTOS_TCP 1 +#elif MG_STMPACK_NET == 3 +#define MG_ENABLE_RL 1 +#endif + +#if MG_ENABLE_PACKED_FS +#define MG_ENABLE_POSIX_FS 0 +#endif + +// See https://mongoose.ws/documentation/#build-options diff --git a/examples/stm32/nucleo-f746zg-cube-baremetal-builtin/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f746zg-cube-baremetal-builtin/Core/Inc/mongoose_custom.h index 37217804..6cd87208 100644 --- a/examples/stm32/nucleo-f746zg-cube-baremetal-builtin/Core/Inc/mongoose_custom.h +++ b/examples/stm32/nucleo-f746zg-cube-baremetal-builtin/Core/Inc/mongoose_custom.h @@ -1,32 +1,32 @@ - -// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based -#if defined(MG_ARCH) -#define MG_STMPACK_ARCH MG_ARCH -#undef MG_ARCH -#elif defined(__GNUC__) -#define MG_STMPACK_ARCH MG_ARCH_NEWLIB -#endif - -#define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_CUSTOM_MILLIS 1 -#define MG_ENABLE_MBEDTLS 0 -#define MG_ARCH MG_STMPACK_ARCH -#define MG_STMPACK_NET 0 -#define MG_ENABLE_CUSTOM_RANDOM 1 - -// Translate to Mongoose macros -#if MG_CMSISPACK_NET == 0 -#define MG_ENABLE_TCPIP 1 -#elif MG_CMSISPACK_NET == 1 -#define MG_ENABLE_LWIP 1 -#elif MG_CMSISPACK_NET == 2 -#define MG_ENABLE_FREERTOS_TCP 1 -#elif MG_CMSISPACK_NET == 3 -#define MG_ENABLE_RL 1 -#endif - -#if MG_ENABLE_PACKED_FS -#define MG_ENABLE_FILE 0 -#endif - -// See https://mongoose.ws/documentation/#build-options + +// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based +#if defined(MG_ARCH) +#define MG_STMPACK_ARCH MG_ARCH +#undef MG_ARCH +#elif defined(__GNUC__) +#define MG_STMPACK_ARCH MG_ARCH_NEWLIB +#endif + +#define MG_ENABLE_PACKED_FS 1 +#define MG_ENABLE_CUSTOM_MILLIS 1 +#define MG_ENABLE_MBEDTLS 0 +#define MG_ARCH MG_STMPACK_ARCH +#define MG_STMPACK_NET 0 +#define MG_ENABLE_CUSTOM_RANDOM 1 + +// Translate to Mongoose macros +#if MG_CMSISPACK_NET == 0 +#define MG_ENABLE_TCPIP 1 +#elif MG_CMSISPACK_NET == 1 +#define MG_ENABLE_LWIP 1 +#elif MG_CMSISPACK_NET == 2 +#define MG_ENABLE_FREERTOS_TCP 1 +#elif MG_CMSISPACK_NET == 3 +#define MG_ENABLE_RL 1 +#endif + +#if MG_ENABLE_PACKED_FS +#define MG_ENABLE_POSIX_FS 0 +#endif + +// See https://mongoose.ws/documentation/#build-options diff --git a/examples/stm32/nucleo-f746zg-cube-freertos-builtin/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f746zg-cube-freertos-builtin/Core/Inc/mongoose_custom.h index 4c3dab86..956a921d 100644 --- a/examples/stm32/nucleo-f746zg-cube-freertos-builtin/Core/Inc/mongoose_custom.h +++ b/examples/stm32/nucleo-f746zg-cube-freertos-builtin/Core/Inc/mongoose_custom.h @@ -1,32 +1,32 @@ - -// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based -#if defined(MG_ARCH) -#define MG_STMPACK_ARCH MG_ARCH -#undef MG_ARCH -#elif defined(__GNUC__) -#define MG_STMPACK_ARCH MG_ARCH_NEWLIB -#endif - -#define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_CUSTOM_MILLIS 0 -#define MG_ENABLE_MBEDTLS 0 -#define MG_ARCH MG_ARCH_CMSIS_RTOS2 -#define MG_STMPACK_NET 0 -#define MG_ENABLE_CUSTOM_RANDOM 1 - -// Translate to Mongoose macros -#if MG_STMPACK_NET == 0 -#define MG_ENABLE_TCPIP 1 -#elif MG_STMPACK_NET == 1 -#define MG_ENABLE_LWIP 1 -#elif MG_STMPACK_NET == 2 -#define MG_ENABLE_FREERTOS_TCP 1 -#elif MG_STMPACK_NET == 3 -#define MG_ENABLE_RL 1 -#endif - -#if MG_ENABLE_PACKED_FS -#define MG_ENABLE_FILE 0 -#endif - -// See https://mongoose.ws/documentation/#build-options + +// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based +#if defined(MG_ARCH) +#define MG_STMPACK_ARCH MG_ARCH +#undef MG_ARCH +#elif defined(__GNUC__) +#define MG_STMPACK_ARCH MG_ARCH_NEWLIB +#endif + +#define MG_ENABLE_PACKED_FS 1 +#define MG_ENABLE_CUSTOM_MILLIS 0 +#define MG_ENABLE_MBEDTLS 0 +#define MG_ARCH MG_ARCH_CMSIS_RTOS2 +#define MG_STMPACK_NET 0 +#define MG_ENABLE_CUSTOM_RANDOM 1 + +// Translate to Mongoose macros +#if MG_STMPACK_NET == 0 +#define MG_ENABLE_TCPIP 1 +#elif MG_STMPACK_NET == 1 +#define MG_ENABLE_LWIP 1 +#elif MG_STMPACK_NET == 2 +#define MG_ENABLE_FREERTOS_TCP 1 +#elif MG_STMPACK_NET == 3 +#define MG_ENABLE_RL 1 +#endif + +#if MG_ENABLE_PACKED_FS +#define MG_ENABLE_POSIX_FS 0 +#endif + +// See https://mongoose.ws/documentation/#build-options diff --git a/examples/stm32/nucleo-f746zg-cube-freertos-lwip/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f746zg-cube-freertos-lwip/Core/Inc/mongoose_custom.h index f4238f40..b6a9622d 100644 --- a/examples/stm32/nucleo-f746zg-cube-freertos-lwip/Core/Inc/mongoose_custom.h +++ b/examples/stm32/nucleo-f746zg-cube-freertos-lwip/Core/Inc/mongoose_custom.h @@ -1,32 +1,32 @@ - -// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based -#if defined(MG_ARCH) -#define MG_STMPACK_ARCH MG_ARCH -#undef MG_ARCH -#elif defined(__GNUC__) -#define MG_STMPACK_ARCH MG_ARCH_NEWLIB -#endif - -#define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_CUSTOM_MILLIS 0 -#define MG_ENABLE_MBEDTLS 0 -#define MG_ARCH MG_ARCH_FREERTOS -#define MG_STMPACK_NET 1 -#define MG_ENABLE_CUSTOM_RANDOM 1 - -// Translate to Mongoose macros -#if MG_STMPACK_NET == 0 -#define MG_ENABLE_TCPIP 1 -#elif MG_STMPACK_NET == 1 -#define MG_ENABLE_LWIP 1 -#elif MG_STMPACK_NET == 2 -#define MG_ENABLE_FREERTOS_TCP 1 -#elif MG_STMPACK_NET == 3 -#define MG_ENABLE_RL 1 -#endif - -#if MG_ENABLE_PACKED_FS -#define MG_ENABLE_FILE 0 -#endif - -// See https://mongoose.ws/documentation/#build-options + +// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based +#if defined(MG_ARCH) +#define MG_STMPACK_ARCH MG_ARCH +#undef MG_ARCH +#elif defined(__GNUC__) +#define MG_STMPACK_ARCH MG_ARCH_NEWLIB +#endif + +#define MG_ENABLE_PACKED_FS 1 +#define MG_ENABLE_CUSTOM_MILLIS 0 +#define MG_ENABLE_MBEDTLS 0 +#define MG_ARCH MG_ARCH_FREERTOS +#define MG_STMPACK_NET 1 +#define MG_ENABLE_CUSTOM_RANDOM 1 + +// Translate to Mongoose macros +#if MG_STMPACK_NET == 0 +#define MG_ENABLE_TCPIP 1 +#elif MG_STMPACK_NET == 1 +#define MG_ENABLE_LWIP 1 +#elif MG_STMPACK_NET == 2 +#define MG_ENABLE_FREERTOS_TCP 1 +#elif MG_STMPACK_NET == 3 +#define MG_ENABLE_RL 1 +#endif + +#if MG_ENABLE_PACKED_FS +#define MG_ENABLE_POSIX_FS 0 +#endif + +// See https://mongoose.ws/documentation/#build-options diff --git a/examples/stm32/nucleo-h743zi-cube-baremetal-builtin/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-h743zi-cube-baremetal-builtin/Core/Inc/mongoose_custom.h index 37217804..6cd87208 100644 --- a/examples/stm32/nucleo-h743zi-cube-baremetal-builtin/Core/Inc/mongoose_custom.h +++ b/examples/stm32/nucleo-h743zi-cube-baremetal-builtin/Core/Inc/mongoose_custom.h @@ -1,32 +1,32 @@ - -// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based -#if defined(MG_ARCH) -#define MG_STMPACK_ARCH MG_ARCH -#undef MG_ARCH -#elif defined(__GNUC__) -#define MG_STMPACK_ARCH MG_ARCH_NEWLIB -#endif - -#define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_CUSTOM_MILLIS 1 -#define MG_ENABLE_MBEDTLS 0 -#define MG_ARCH MG_STMPACK_ARCH -#define MG_STMPACK_NET 0 -#define MG_ENABLE_CUSTOM_RANDOM 1 - -// Translate to Mongoose macros -#if MG_CMSISPACK_NET == 0 -#define MG_ENABLE_TCPIP 1 -#elif MG_CMSISPACK_NET == 1 -#define MG_ENABLE_LWIP 1 -#elif MG_CMSISPACK_NET == 2 -#define MG_ENABLE_FREERTOS_TCP 1 -#elif MG_CMSISPACK_NET == 3 -#define MG_ENABLE_RL 1 -#endif - -#if MG_ENABLE_PACKED_FS -#define MG_ENABLE_FILE 0 -#endif - -// See https://mongoose.ws/documentation/#build-options + +// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based +#if defined(MG_ARCH) +#define MG_STMPACK_ARCH MG_ARCH +#undef MG_ARCH +#elif defined(__GNUC__) +#define MG_STMPACK_ARCH MG_ARCH_NEWLIB +#endif + +#define MG_ENABLE_PACKED_FS 1 +#define MG_ENABLE_CUSTOM_MILLIS 1 +#define MG_ENABLE_MBEDTLS 0 +#define MG_ARCH MG_STMPACK_ARCH +#define MG_STMPACK_NET 0 +#define MG_ENABLE_CUSTOM_RANDOM 1 + +// Translate to Mongoose macros +#if MG_CMSISPACK_NET == 0 +#define MG_ENABLE_TCPIP 1 +#elif MG_CMSISPACK_NET == 1 +#define MG_ENABLE_LWIP 1 +#elif MG_CMSISPACK_NET == 2 +#define MG_ENABLE_FREERTOS_TCP 1 +#elif MG_CMSISPACK_NET == 3 +#define MG_ENABLE_RL 1 +#endif + +#if MG_ENABLE_PACKED_FS +#define MG_ENABLE_POSIX_FS 0 +#endif + +// See https://mongoose.ws/documentation/#build-options diff --git a/examples/stm32/nucleo-h743zi-cube-freertos-builtin/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-h743zi-cube-freertos-builtin/Core/Inc/mongoose_custom.h index 4c3dab86..956a921d 100644 --- a/examples/stm32/nucleo-h743zi-cube-freertos-builtin/Core/Inc/mongoose_custom.h +++ b/examples/stm32/nucleo-h743zi-cube-freertos-builtin/Core/Inc/mongoose_custom.h @@ -1,32 +1,32 @@ - -// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based -#if defined(MG_ARCH) -#define MG_STMPACK_ARCH MG_ARCH -#undef MG_ARCH -#elif defined(__GNUC__) -#define MG_STMPACK_ARCH MG_ARCH_NEWLIB -#endif - -#define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_CUSTOM_MILLIS 0 -#define MG_ENABLE_MBEDTLS 0 -#define MG_ARCH MG_ARCH_CMSIS_RTOS2 -#define MG_STMPACK_NET 0 -#define MG_ENABLE_CUSTOM_RANDOM 1 - -// Translate to Mongoose macros -#if MG_STMPACK_NET == 0 -#define MG_ENABLE_TCPIP 1 -#elif MG_STMPACK_NET == 1 -#define MG_ENABLE_LWIP 1 -#elif MG_STMPACK_NET == 2 -#define MG_ENABLE_FREERTOS_TCP 1 -#elif MG_STMPACK_NET == 3 -#define MG_ENABLE_RL 1 -#endif - -#if MG_ENABLE_PACKED_FS -#define MG_ENABLE_FILE 0 -#endif - -// See https://mongoose.ws/documentation/#build-options + +// If we could guess an MG_ARCH so far, preserve it, otherwise try GCC-based +#if defined(MG_ARCH) +#define MG_STMPACK_ARCH MG_ARCH +#undef MG_ARCH +#elif defined(__GNUC__) +#define MG_STMPACK_ARCH MG_ARCH_NEWLIB +#endif + +#define MG_ENABLE_PACKED_FS 1 +#define MG_ENABLE_CUSTOM_MILLIS 0 +#define MG_ENABLE_MBEDTLS 0 +#define MG_ARCH MG_ARCH_CMSIS_RTOS2 +#define MG_STMPACK_NET 0 +#define MG_ENABLE_CUSTOM_RANDOM 1 + +// Translate to Mongoose macros +#if MG_STMPACK_NET == 0 +#define MG_ENABLE_TCPIP 1 +#elif MG_STMPACK_NET == 1 +#define MG_ENABLE_LWIP 1 +#elif MG_STMPACK_NET == 2 +#define MG_ENABLE_FREERTOS_TCP 1 +#elif MG_STMPACK_NET == 3 +#define MG_ENABLE_RL 1 +#endif + +#if MG_ENABLE_PACKED_FS +#define MG_ENABLE_POSIX_FS 0 +#endif + +// See https://mongoose.ws/documentation/#build-options diff --git a/examples/wch/ch32v307-make-baremetal-builtin/mongoose_custom.h b/examples/wch/ch32v307-make-baremetal-builtin/mongoose_custom.h index 621d7211..d4d01851 100644 --- a/examples/wch/ch32v307-make-baremetal-builtin/mongoose_custom.h +++ b/examples/wch/ch32v307-make-baremetal-builtin/mongoose_custom.h @@ -9,7 +9,7 @@ #define MG_ENABLE_CUSTOM_MILLIS 1 #define MG_ENABLE_CUSTOM_RANDOM 1 #define MG_ENABLE_PACKED_FS 1 -#define MG_ENABLE_FILE 0 +#define MG_ENABLE_POSIX_FS 0 #define MG_ENABLE_DRIVER_STM32F 1 #define MG_ENABLE_LINES 1 #define MG_IO_SIZE 256 diff --git a/mongoose.c b/mongoose.c index 12569e41..815e2f06 100644 --- a/mongoose.c +++ b/mongoose.c @@ -1931,7 +1931,7 @@ struct mg_fs mg_fs_packed = { #endif -#if MG_ENABLE_FILE +#if MG_ENABLE_POSIX_FS #ifndef MG_STAT_STRUCT #define MG_STAT_STRUCT stat @@ -4532,289 +4532,6 @@ struct mg_connection *mg_mqtt_listen(struct mg_mgr *mgr, const char *url, return c; } -#ifdef MG_ENABLE_LINES -#line 1 "src/net.c" -#endif - - - - - - - - - -size_t mg_vprintf(struct mg_connection *c, const char *fmt, va_list *ap) { - size_t old = c->send.len; - mg_vxprintf(mg_pfn_iobuf, &c->send, fmt, ap); - return c->send.len - old; -} - -size_t mg_printf(struct mg_connection *c, const char *fmt, ...) { - size_t len = 0; - va_list ap; - va_start(ap, fmt); - len = mg_vprintf(c, fmt, &ap); - va_end(ap); - return len; -} - -static bool mg_atonl(struct mg_str str, struct mg_addr *addr) { - uint32_t localhost = mg_htonl(0x7f000001); - if (mg_vcasecmp(&str, "localhost") != 0) return false; - memcpy(addr->ip, &localhost, sizeof(uint32_t)); - addr->is_ip6 = false; - return true; -} - -static bool mg_atone(struct mg_str str, struct mg_addr *addr) { - if (str.len > 0) return false; - memset(addr->ip, 0, sizeof(addr->ip)); - addr->is_ip6 = false; - return true; -} - -static bool mg_aton4(struct mg_str str, struct mg_addr *addr) { - uint8_t data[4] = {0, 0, 0, 0}; - size_t i, num_dots = 0; - for (i = 0; i < str.len; i++) { - if (str.ptr[i] >= '0' && str.ptr[i] <= '9') { - int octet = data[num_dots] * 10 + (str.ptr[i] - '0'); - if (octet > 255) return false; - data[num_dots] = (uint8_t) octet; - } else if (str.ptr[i] == '.') { - if (num_dots >= 3 || i == 0 || str.ptr[i - 1] == '.') return false; - num_dots++; - } else { - return false; - } - } - if (num_dots != 3 || str.ptr[i - 1] == '.') return false; - memcpy(&addr->ip, data, sizeof(data)); - addr->is_ip6 = false; - return true; -} - -static bool mg_v4mapped(struct mg_str str, struct mg_addr *addr) { - int i; - uint32_t ipv4; - if (str.len < 14) return false; - if (str.ptr[0] != ':' || str.ptr[1] != ':' || str.ptr[6] != ':') return false; - for (i = 2; i < 6; i++) { - if (str.ptr[i] != 'f' && str.ptr[i] != 'F') return false; - } - // struct mg_str s = mg_str_n(&str.ptr[7], str.len - 7); - if (!mg_aton4(mg_str_n(&str.ptr[7], str.len - 7), addr)) return false; - memcpy(&ipv4, addr->ip, sizeof(ipv4)); - memset(addr->ip, 0, sizeof(addr->ip)); - addr->ip[10] = addr->ip[11] = 255; - memcpy(&addr->ip[12], &ipv4, 4); - addr->is_ip6 = true; - return true; -} - -static bool mg_aton6(struct mg_str str, struct mg_addr *addr) { - size_t i, j = 0, n = 0, dc = 42; - addr->scope_id = 0; - if (str.len > 2 && str.ptr[0] == '[') str.ptr++, str.len -= 2; - if (mg_v4mapped(str, addr)) return true; - for (i = 0; i < str.len; i++) { - if ((str.ptr[i] >= '0' && str.ptr[i] <= '9') || - (str.ptr[i] >= 'a' && str.ptr[i] <= 'f') || - (str.ptr[i] >= 'A' && str.ptr[i] <= 'F')) { - unsigned long val; - if (i > j + 3) return false; - // MG_DEBUG(("%lu %lu [%.*s]", i, j, (int) (i - j + 1), &str.ptr[j])); - val = mg_unhexn(&str.ptr[j], i - j + 1); - addr->ip[n] = (uint8_t) ((val >> 8) & 255); - addr->ip[n + 1] = (uint8_t) (val & 255); - } else if (str.ptr[i] == ':') { - j = i + 1; - if (i > 0 && str.ptr[i - 1] == ':') { - dc = n; // Double colon - if (i > 1 && str.ptr[i - 2] == ':') return false; - } else if (i > 0) { - n += 2; - } - if (n > 14) return false; - addr->ip[n] = addr->ip[n + 1] = 0; // For trailing :: - } else if (str.ptr[i] == '%') { // Scope ID - for (i = i + 1; i < str.len; i++) { - if (str.ptr[i] < '0' || str.ptr[i] > '9') return false; - addr->scope_id = (uint8_t) (addr->scope_id * 10); - addr->scope_id = (uint8_t) (addr->scope_id + (str.ptr[i] - '0')); - } - } else { - return false; - } - } - if (n < 14 && dc == 42) return false; - if (n < 14) { - memmove(&addr->ip[dc + (14 - n)], &addr->ip[dc], n - dc + 2); - memset(&addr->ip[dc], 0, 14 - n); - } - - addr->is_ip6 = true; - return true; -} - -bool mg_aton(struct mg_str str, struct mg_addr *addr) { - // MG_INFO(("[%.*s]", (int) str.len, str.ptr)); - return mg_atone(str, addr) || mg_atonl(str, addr) || mg_aton4(str, addr) || - mg_aton6(str, addr); -} - -struct mg_connection *mg_alloc_conn(struct mg_mgr *mgr) { - struct mg_connection *c = - (struct mg_connection *) calloc(1, sizeof(*c) + mgr->extraconnsize); - if (c != NULL) { - c->mgr = mgr; - c->send.align = c->recv.align = c->rtls.align = MG_IO_SIZE; - c->id = ++mgr->nextid; - MG_PROF_INIT(c); - } - return c; -} - -void mg_close_conn(struct mg_connection *c) { - mg_resolve_cancel(c); // Close any pending DNS query - LIST_DELETE(struct mg_connection, &c->mgr->conns, c); - if (c == c->mgr->dns4.c) c->mgr->dns4.c = NULL; - if (c == c->mgr->dns6.c) c->mgr->dns6.c = NULL; - // Order of operations is important. `MG_EV_CLOSE` event must be fired - // before we deallocate received data, see #1331 - mg_call(c, MG_EV_CLOSE, NULL); - MG_DEBUG(("%lu %ld closed", c->id, c->fd)); - MG_PROF_DUMP(c); - MG_PROF_FREE(c); - - mg_tls_free(c); - mg_iobuf_free(&c->recv); - mg_iobuf_free(&c->send); - mg_iobuf_free(&c->rtls); - mg_bzero((unsigned char *) c, sizeof(*c)); - free(c); -} - -struct mg_connection *mg_connect(struct mg_mgr *mgr, const char *url, - mg_event_handler_t fn, void *fn_data) { - struct mg_connection *c = NULL; - if (url == NULL || url[0] == '\0') { - MG_ERROR(("null url")); - } else if ((c = mg_alloc_conn(mgr)) == NULL) { - MG_ERROR(("OOM")); - } else { - LIST_ADD_HEAD(struct mg_connection, &mgr->conns, c); - c->is_udp = (strncmp(url, "udp:", 4) == 0); - c->fd = (void *) (size_t) MG_INVALID_SOCKET; - c->fn = fn; - c->is_client = true; - c->fn_data = fn_data; - MG_DEBUG(("%lu %ld %s", c->id, c->fd, url)); - mg_call(c, MG_EV_OPEN, (void *) url); - mg_resolve(c, url); - } - return c; -} - -struct mg_connection *mg_listen(struct mg_mgr *mgr, const char *url, - mg_event_handler_t fn, void *fn_data) { - struct mg_connection *c = NULL; - if ((c = mg_alloc_conn(mgr)) == NULL) { - MG_ERROR(("OOM %s", url)); - } else if (!mg_open_listener(c, url)) { - MG_ERROR(("Failed: %s, errno %d", url, errno)); - MG_PROF_FREE(c); - free(c); - c = NULL; - } else { - c->is_listening = 1; - c->is_udp = strncmp(url, "udp:", 4) == 0; - LIST_ADD_HEAD(struct mg_connection, &mgr->conns, c); - c->fn = fn; - c->fn_data = fn_data; - mg_call(c, MG_EV_OPEN, NULL); - if (mg_url_is_ssl(url)) c->is_tls = 1; // Accepted connection must - MG_DEBUG(("%lu %ld %s", c->id, c->fd, url)); - } - return c; -} - -struct mg_connection *mg_wrapfd(struct mg_mgr *mgr, int fd, - mg_event_handler_t fn, void *fn_data) { - struct mg_connection *c = mg_alloc_conn(mgr); - if (c != NULL) { - c->fd = (void *) (size_t) fd; - c->fn = fn; - c->fn_data = fn_data; - MG_EPOLL_ADD(c); - mg_call(c, MG_EV_OPEN, NULL); - LIST_ADD_HEAD(struct mg_connection, &mgr->conns, c); - } - return c; -} - -struct mg_timer *mg_timer_add(struct mg_mgr *mgr, uint64_t milliseconds, - unsigned flags, void (*fn)(void *), void *arg) { - struct mg_timer *t = (struct mg_timer *) calloc(1, sizeof(*t)); - if (t != NULL) { - mg_timer_init(&mgr->timers, t, milliseconds, flags, fn, arg); - t->id = mgr->timerid++; - } - return t; -} - -long mg_io_recv(struct mg_connection *c, void *buf, size_t len) { - if (c->rtls.len == 0) return MG_IO_WAIT; - if (len > c->rtls.len) len = c->rtls.len; - memcpy(buf, c->rtls.buf, len); - mg_iobuf_del(&c->rtls, 0, len); - return (long) len; -} - -void mg_mgr_free(struct mg_mgr *mgr) { - struct mg_connection *c; - struct mg_timer *tmp, *t = mgr->timers; - while (t != NULL) tmp = t->next, free(t), t = tmp; - mgr->timers = NULL; // Important. Next call to poll won't touch timers - for (c = mgr->conns; c != NULL; c = c->next) c->is_closing = 1; - mg_mgr_poll(mgr, 0); -#if MG_ENABLE_FREERTOS_TCP - FreeRTOS_DeleteSocketSet(mgr->ss); -#endif - MG_DEBUG(("All connections closed")); -#if MG_ENABLE_EPOLL - if (mgr->epoll_fd >= 0) close(mgr->epoll_fd), mgr->epoll_fd = -1; -#endif - mg_tls_ctx_free(mgr); -} - -void mg_mgr_init(struct mg_mgr *mgr) { - memset(mgr, 0, sizeof(*mgr)); -#if MG_ENABLE_EPOLL - if ((mgr->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) - MG_ERROR(("epoll_create1 errno %d", errno)); -#else - mgr->epoll_fd = -1; -#endif -#if MG_ARCH == MG_ARCH_WIN32 && MG_ENABLE_WINSOCK - // clang-format off - { WSADATA data; WSAStartup(MAKEWORD(2, 2), &data); } - // clang-format on -#elif MG_ENABLE_FREERTOS_TCP - mgr->ss = FreeRTOS_CreateSocketSet(); -#elif defined(__unix) || defined(__unix__) || defined(__APPLE__) - // Ignore SIGPIPE signal, so if client cancels the request, it - // won't kill the whole process. - signal(SIGPIPE, SIG_IGN); -#endif - mgr->pipe = MG_INVALID_SOCKET; - mgr->dnstimeout = 3000; - mgr->dns4.url = "udp://8.8.8.8:53"; - mgr->dns6.url = "udp://[2001:4860:4860::8888]:53"; - mg_tls_ctx_init(mgr); -} - #ifdef MG_ENABLE_LINES #line 1 "src/net_builtin.c" #endif @@ -5925,6 +5642,289 @@ bool mg_send(struct mg_connection *c, const void *buf, size_t len) { } #endif // MG_ENABLE_TCPIP +#ifdef MG_ENABLE_LINES +#line 1 "src/net.c" +#endif + + + + + + + + + +size_t mg_vprintf(struct mg_connection *c, const char *fmt, va_list *ap) { + size_t old = c->send.len; + mg_vxprintf(mg_pfn_iobuf, &c->send, fmt, ap); + return c->send.len - old; +} + +size_t mg_printf(struct mg_connection *c, const char *fmt, ...) { + size_t len = 0; + va_list ap; + va_start(ap, fmt); + len = mg_vprintf(c, fmt, &ap); + va_end(ap); + return len; +} + +static bool mg_atonl(struct mg_str str, struct mg_addr *addr) { + uint32_t localhost = mg_htonl(0x7f000001); + if (mg_vcasecmp(&str, "localhost") != 0) return false; + memcpy(addr->ip, &localhost, sizeof(uint32_t)); + addr->is_ip6 = false; + return true; +} + +static bool mg_atone(struct mg_str str, struct mg_addr *addr) { + if (str.len > 0) return false; + memset(addr->ip, 0, sizeof(addr->ip)); + addr->is_ip6 = false; + return true; +} + +static bool mg_aton4(struct mg_str str, struct mg_addr *addr) { + uint8_t data[4] = {0, 0, 0, 0}; + size_t i, num_dots = 0; + for (i = 0; i < str.len; i++) { + if (str.ptr[i] >= '0' && str.ptr[i] <= '9') { + int octet = data[num_dots] * 10 + (str.ptr[i] - '0'); + if (octet > 255) return false; + data[num_dots] = (uint8_t) octet; + } else if (str.ptr[i] == '.') { + if (num_dots >= 3 || i == 0 || str.ptr[i - 1] == '.') return false; + num_dots++; + } else { + return false; + } + } + if (num_dots != 3 || str.ptr[i - 1] == '.') return false; + memcpy(&addr->ip, data, sizeof(data)); + addr->is_ip6 = false; + return true; +} + +static bool mg_v4mapped(struct mg_str str, struct mg_addr *addr) { + int i; + uint32_t ipv4; + if (str.len < 14) return false; + if (str.ptr[0] != ':' || str.ptr[1] != ':' || str.ptr[6] != ':') return false; + for (i = 2; i < 6; i++) { + if (str.ptr[i] != 'f' && str.ptr[i] != 'F') return false; + } + // struct mg_str s = mg_str_n(&str.ptr[7], str.len - 7); + if (!mg_aton4(mg_str_n(&str.ptr[7], str.len - 7), addr)) return false; + memcpy(&ipv4, addr->ip, sizeof(ipv4)); + memset(addr->ip, 0, sizeof(addr->ip)); + addr->ip[10] = addr->ip[11] = 255; + memcpy(&addr->ip[12], &ipv4, 4); + addr->is_ip6 = true; + return true; +} + +static bool mg_aton6(struct mg_str str, struct mg_addr *addr) { + size_t i, j = 0, n = 0, dc = 42; + addr->scope_id = 0; + if (str.len > 2 && str.ptr[0] == '[') str.ptr++, str.len -= 2; + if (mg_v4mapped(str, addr)) return true; + for (i = 0; i < str.len; i++) { + if ((str.ptr[i] >= '0' && str.ptr[i] <= '9') || + (str.ptr[i] >= 'a' && str.ptr[i] <= 'f') || + (str.ptr[i] >= 'A' && str.ptr[i] <= 'F')) { + unsigned long val; + if (i > j + 3) return false; + // MG_DEBUG(("%lu %lu [%.*s]", i, j, (int) (i - j + 1), &str.ptr[j])); + val = mg_unhexn(&str.ptr[j], i - j + 1); + addr->ip[n] = (uint8_t) ((val >> 8) & 255); + addr->ip[n + 1] = (uint8_t) (val & 255); + } else if (str.ptr[i] == ':') { + j = i + 1; + if (i > 0 && str.ptr[i - 1] == ':') { + dc = n; // Double colon + if (i > 1 && str.ptr[i - 2] == ':') return false; + } else if (i > 0) { + n += 2; + } + if (n > 14) return false; + addr->ip[n] = addr->ip[n + 1] = 0; // For trailing :: + } else if (str.ptr[i] == '%') { // Scope ID + for (i = i + 1; i < str.len; i++) { + if (str.ptr[i] < '0' || str.ptr[i] > '9') return false; + addr->scope_id = (uint8_t) (addr->scope_id * 10); + addr->scope_id = (uint8_t) (addr->scope_id + (str.ptr[i] - '0')); + } + } else { + return false; + } + } + if (n < 14 && dc == 42) return false; + if (n < 14) { + memmove(&addr->ip[dc + (14 - n)], &addr->ip[dc], n - dc + 2); + memset(&addr->ip[dc], 0, 14 - n); + } + + addr->is_ip6 = true; + return true; +} + +bool mg_aton(struct mg_str str, struct mg_addr *addr) { + // MG_INFO(("[%.*s]", (int) str.len, str.ptr)); + return mg_atone(str, addr) || mg_atonl(str, addr) || mg_aton4(str, addr) || + mg_aton6(str, addr); +} + +struct mg_connection *mg_alloc_conn(struct mg_mgr *mgr) { + struct mg_connection *c = + (struct mg_connection *) calloc(1, sizeof(*c) + mgr->extraconnsize); + if (c != NULL) { + c->mgr = mgr; + c->send.align = c->recv.align = c->rtls.align = MG_IO_SIZE; + c->id = ++mgr->nextid; + MG_PROF_INIT(c); + } + return c; +} + +void mg_close_conn(struct mg_connection *c) { + mg_resolve_cancel(c); // Close any pending DNS query + LIST_DELETE(struct mg_connection, &c->mgr->conns, c); + if (c == c->mgr->dns4.c) c->mgr->dns4.c = NULL; + if (c == c->mgr->dns6.c) c->mgr->dns6.c = NULL; + // Order of operations is important. `MG_EV_CLOSE` event must be fired + // before we deallocate received data, see #1331 + mg_call(c, MG_EV_CLOSE, NULL); + MG_DEBUG(("%lu %ld closed", c->id, c->fd)); + MG_PROF_DUMP(c); + MG_PROF_FREE(c); + + mg_tls_free(c); + mg_iobuf_free(&c->recv); + mg_iobuf_free(&c->send); + mg_iobuf_free(&c->rtls); + mg_bzero((unsigned char *) c, sizeof(*c)); + free(c); +} + +struct mg_connection *mg_connect(struct mg_mgr *mgr, const char *url, + mg_event_handler_t fn, void *fn_data) { + struct mg_connection *c = NULL; + if (url == NULL || url[0] == '\0') { + MG_ERROR(("null url")); + } else if ((c = mg_alloc_conn(mgr)) == NULL) { + MG_ERROR(("OOM")); + } else { + LIST_ADD_HEAD(struct mg_connection, &mgr->conns, c); + c->is_udp = (strncmp(url, "udp:", 4) == 0); + c->fd = (void *) (size_t) MG_INVALID_SOCKET; + c->fn = fn; + c->is_client = true; + c->fn_data = fn_data; + MG_DEBUG(("%lu %ld %s", c->id, c->fd, url)); + mg_call(c, MG_EV_OPEN, (void *) url); + mg_resolve(c, url); + } + return c; +} + +struct mg_connection *mg_listen(struct mg_mgr *mgr, const char *url, + mg_event_handler_t fn, void *fn_data) { + struct mg_connection *c = NULL; + if ((c = mg_alloc_conn(mgr)) == NULL) { + MG_ERROR(("OOM %s", url)); + } else if (!mg_open_listener(c, url)) { + MG_ERROR(("Failed: %s, errno %d", url, errno)); + MG_PROF_FREE(c); + free(c); + c = NULL; + } else { + c->is_listening = 1; + c->is_udp = strncmp(url, "udp:", 4) == 0; + LIST_ADD_HEAD(struct mg_connection, &mgr->conns, c); + c->fn = fn; + c->fn_data = fn_data; + mg_call(c, MG_EV_OPEN, NULL); + if (mg_url_is_ssl(url)) c->is_tls = 1; // Accepted connection must + MG_DEBUG(("%lu %ld %s", c->id, c->fd, url)); + } + return c; +} + +struct mg_connection *mg_wrapfd(struct mg_mgr *mgr, int fd, + mg_event_handler_t fn, void *fn_data) { + struct mg_connection *c = mg_alloc_conn(mgr); + if (c != NULL) { + c->fd = (void *) (size_t) fd; + c->fn = fn; + c->fn_data = fn_data; + MG_EPOLL_ADD(c); + mg_call(c, MG_EV_OPEN, NULL); + LIST_ADD_HEAD(struct mg_connection, &mgr->conns, c); + } + return c; +} + +struct mg_timer *mg_timer_add(struct mg_mgr *mgr, uint64_t milliseconds, + unsigned flags, void (*fn)(void *), void *arg) { + struct mg_timer *t = (struct mg_timer *) calloc(1, sizeof(*t)); + if (t != NULL) { + mg_timer_init(&mgr->timers, t, milliseconds, flags, fn, arg); + t->id = mgr->timerid++; + } + return t; +} + +long mg_io_recv(struct mg_connection *c, void *buf, size_t len) { + if (c->rtls.len == 0) return MG_IO_WAIT; + if (len > c->rtls.len) len = c->rtls.len; + memcpy(buf, c->rtls.buf, len); + mg_iobuf_del(&c->rtls, 0, len); + return (long) len; +} + +void mg_mgr_free(struct mg_mgr *mgr) { + struct mg_connection *c; + struct mg_timer *tmp, *t = mgr->timers; + while (t != NULL) tmp = t->next, free(t), t = tmp; + mgr->timers = NULL; // Important. Next call to poll won't touch timers + for (c = mgr->conns; c != NULL; c = c->next) c->is_closing = 1; + mg_mgr_poll(mgr, 0); +#if MG_ENABLE_FREERTOS_TCP + FreeRTOS_DeleteSocketSet(mgr->ss); +#endif + MG_DEBUG(("All connections closed")); +#if MG_ENABLE_EPOLL + if (mgr->epoll_fd >= 0) close(mgr->epoll_fd), mgr->epoll_fd = -1; +#endif + mg_tls_ctx_free(mgr); +} + +void mg_mgr_init(struct mg_mgr *mgr) { + memset(mgr, 0, sizeof(*mgr)); +#if MG_ENABLE_EPOLL + if ((mgr->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) + MG_ERROR(("epoll_create1 errno %d", errno)); +#else + mgr->epoll_fd = -1; +#endif +#if MG_ARCH == MG_ARCH_WIN32 && MG_ENABLE_WINSOCK + // clang-format off + { WSADATA data; WSAStartup(MAKEWORD(2, 2), &data); } + // clang-format on +#elif MG_ENABLE_FREERTOS_TCP + mgr->ss = FreeRTOS_CreateSocketSet(); +#elif defined(__unix) || defined(__unix__) || defined(__APPLE__) + // Ignore SIGPIPE signal, so if client cancels the request, it + // won't kill the whole process. + signal(SIGPIPE, SIG_IGN); +#endif + mgr->pipe = MG_INVALID_SOCKET; + mgr->dnstimeout = 3000; + mgr->dns4.url = "udp://8.8.8.8:53"; + mgr->dns6.url = "udp://[2001:4860:4860::8888]:53"; + mg_tls_ctx_init(mgr); +} + #ifdef MG_ENABLE_LINES #line 1 "src/ota_dummy.c" #endif diff --git a/mongoose.h b/mongoose.h index 1c101308..749a1785 100644 --- a/mongoose.h +++ b/mongoose.h @@ -791,11 +791,11 @@ struct timeval { #define MG_DIRSEP '/' #endif -#ifndef MG_ENABLE_FILE +#ifndef MG_ENABLE_POSIX_FS #if defined(FOPEN_MAX) -#define MG_ENABLE_FILE 1 +#define MG_ENABLE_POSIX_FS 1 #else -#define MG_ENABLE_FILE 0 +#define MG_ENABLE_POSIX_FS 0 #endif #endif diff --git a/src/config.h b/src/config.h index e480c03f..50161eeb 100644 --- a/src/config.h +++ b/src/config.h @@ -117,11 +117,11 @@ #define MG_DIRSEP '/' #endif -#ifndef MG_ENABLE_FILE +#ifndef MG_ENABLE_POSIX_FS #if defined(FOPEN_MAX) -#define MG_ENABLE_FILE 1 +#define MG_ENABLE_POSIX_FS 1 #else -#define MG_ENABLE_FILE 0 +#define MG_ENABLE_POSIX_FS 0 #endif #endif diff --git a/src/fs_posix.c b/src/fs_posix.c index f668fa49..8a631fb2 100644 --- a/src/fs_posix.c +++ b/src/fs_posix.c @@ -1,6 +1,6 @@ #include "fs.h" -#if MG_ENABLE_FILE +#if MG_ENABLE_POSIX_FS #ifndef MG_STAT_STRUCT #define MG_STAT_STRUCT stat