Create MG_ARCH_FREERTOS, MG_ENABLE_LWIP, MG_ENABLE_FREERTOS_TCP. Remove MG_ARCH_FREERTOS_TCP, MG_ARCH_RTX_LWIP

src/arch.h

@@ -1,19 +1,17 @@
 #pragma once
 
-#define MG_ARCH_CUSTOM 0
-#define MG_ARCH_UNIX 1
-#define MG_ARCH_WIN32 2
-#define MG_ARCH_ESP32 3
-#define MG_ARCH_ESP8266 4
-#define MG_ARCH_FREERTOS_TCP 5
-#define MG_ARCH_FREERTOS_LWIP 6
-#define MG_ARCH_AZURERTOS 7
-#define MG_ARCH_RTX_LWIP 8
-#define MG_ARCH_ZEPHYR 9
-#define MG_ARCH_NEWLIB 10
-#define MG_ARCH_RTX 11
-#define MG_ARCH_TIRTOS 12
-#define MG_ARCH_RP2040 13
+#define MG_ARCH_CUSTOM 0     // User creates its own mongoose_custom.h
+#define MG_ARCH_UNIX 1       // Linux, BSD, Mac, ...
+#define MG_ARCH_WIN32 2      // Windows
+#define MG_ARCH_ESP32 3      // ESP32
+#define MG_ARCH_ESP8266 4    // ESP8266
+#define MG_ARCH_FREERTOS 5   // FreeRTOS
+#define MG_ARCH_AZURERTOS 6  // MS Azure RTOS
+#define MG_ARCH_ZEPHYR 7     // Zephyr RTOS
+#define MG_ARCH_NEWLIB 8     // Bare metal ARM
+#define MG_ARCH_RTX 9        // Keil MDK RTX
+#define MG_ARCH_TIRTOS 10    // Texas Semi TI-RTOS
+#define MG_ARCH_RP2040 11    // Raspberry Pi RP2040
 
 #if !defined(MG_ARCH)
 #if defined(__unix__) || defined(__APPLE__)
@@ -27,7 +25,8 @@
 #elif defined(ESP_PLATFORM)
 #define MG_ARCH MG_ARCH_ESP32
 #elif defined(FREERTOS_IP_H)
-#define MG_ARCH MG_ARCH_FREERTOS_TCP
+#define MG_ARCH MG_ARCH_FREERTOS
+#define MG_ENABLE_FREERTOS_TCP 1
 #elif defined(AZURE_RTOS_THREADX)
 #define MG_ARCH MG_ARCH_AZURERTOS
 #elif defined(PICO_TARGET_NAME)
@@ -44,15 +43,17 @@
 #endif
 
 // http://esr.ibiblio.org/?p=5095
-#define MG_BIG_ENDIAN (*(uint16_t *)"\0\xff" < 0x100)
+#define MG_BIG_ENDIAN (*(uint16_t *) "\0\xff" < 0x100)
 
 #include "arch_esp32.h"
 #include "arch_esp8266.h"
-#include "arch_freertos_lwip.h"
-#include "arch_freertos_tcp.h"
+#include "arch_freertos.h"
 #include "arch_newlib.h"
 #include "arch_rtx.h"
-#include "arch_rtx_lwip.h"
 #include "arch_unix.h"
 #include "arch_win32.h"
 #include "arch_zephyr.h"
+
+#include "net_ft.h"
+#include "net_lwip.h"
+#include "net_rl.h"

src/arch_freertos.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#if MG_ARCH == MG_ARCH_FREERTOS_LWIP
+#if MG_ARCH == MG_ARCH_FREERTOS
 
 #include <ctype.h>
+// #include <errno.h> // Cannot include errno - might conflict with lwip!
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -10,40 +11,29 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined(__GNUC__)
-#include <sys/stat.h>
-#include <sys/time.h>
-#else
-struct timeval {
-  time_t tv_sec;
-  long tv_usec;
-};
-#endif
-
 #include <FreeRTOS.h>
 #include <task.h>
 
-#include <lwip/sockets.h>
-
-#if LWIP_SOCKET != 1
-// Sockets support disabled in LWIP by default
-#error Set LWIP_SOCKET variable to 1 (in lwipopts.h)
-#endif
-
-// Re-route calloc/free to the FreeRTOS's functions, don't use stdlib
-static inline void *mg_calloc(int cnt, size_t size) {
-  void *p = pvPortMalloc(cnt * size);
-  if (p != NULL) memset(p, 0, size * cnt);
-  return p;
-}
-#define calloc(a, b) mg_calloc((a), (b))
-#define free(a) vPortFree(a)
-#define malloc(a) pvPortMalloc(a)
-#define strdup(s) ((char *) mg_strdup(mg_str(s)).ptr)
-#define mkdir(a, b) (-1)
-
 #ifndef MG_IO_SIZE
 #define MG_IO_SIZE 512
 #endif
 
-#endif  // MG_ARCH == MG_ARCH_FREERTOS_LWIP
+#define calloc(a, b) mg_calloc(a, b)
+#define free(a) vPortFree(a)
+#define malloc(a) pvPortMalloc(a)
+#define strdup(s) ((char *) mg_strdup(mg_str(s)).ptr)
+
+// Re-route calloc/free to the FreeRTOS's functions, don't use stdlib
+static inline void *mg_calloc(size_t cnt, size_t size) {
+  void *p = pvPortMalloc(cnt * size);
+  if (p != NULL) memset(p, 0, size * cnt);
+  return p;
+}
+
+#define mkdir(a, b) mg_mkdir(a, b)
+static inline int mg_mkdir(const char *path, mode_t mode) {
+  (void) path, (void) mode;
+  return -1;
+}
+
+#endif  // MG_ARCH == MG_ARCH_FREERTOS

src/arch_rtx.h

@@ -13,18 +13,8 @@
 #include <string.h>
 #include <time.h>
 
-#include <rl_net.h>
-
-#define MG_ENABLE_CUSTOM_MILLIS 1
-typedef int socklen_t;
-#define closesocket(x) closesocket(x)
-#define mkdir(a, b) (-1)
-#define EWOULDBLOCK BSD_EWOULDBLOCK
-#define EAGAIN BSD_EWOULDBLOCK
-#define EINPROGRESS BSD_EWOULDBLOCK
-#define EINTR BSD_EWOULDBLOCK
-#define ECONNRESET BSD_ECONNRESET
-#define EPIPE BSD_ECONNRESET
-#define TCP_NODELAY SO_KEEPALIVE
+#if !defined MG_ENABLE_RL && (!defined(MG_ENABLE_LWIP) || !MG_ENABLE_LWIP)
+#define MG_ENABLE_RL 1
+#endif
 
 #endif

src/config.h

@@ -5,7 +5,23 @@
 #endif
 
 #ifndef MG_ENABLE_MIP
-#define MG_ENABLE_MIP 0
+#define MG_ENABLE_MIP 0  // Mongoose built-in network stack
+#endif
+
+#ifndef MG_ENABLE_LWIP
+#define MG_ENABLE_LWIP 0  // lWIP network stack
+#endif
+
+#ifndef MG_ENABLE_FREERTOS_TCP
+#define MG_ENABLE_FREERTOS_TCP 0  // Amazon FreeRTOS-TCP network stack
+#endif
+
+#ifndef MG_ENABLE_RL
+#define MG_ENABLE_RL 0  // ARM MDK network stack
+#endif
+
+#ifndef MG_ENABLE_SOCKET
+#define MG_ENABLE_SOCKET !MG_ENABLE_MIP
 #endif
 
 #ifndef MG_ENABLE_POLL
@@ -20,10 +36,6 @@
 #define MG_ENABLE_FATFS 0
 #endif
 
-#ifndef MG_ENABLE_SOCKET
-#define MG_ENABLE_SOCKET 1
-#endif
-
 #ifndef MG_ENABLE_MBEDTLS
 #define MG_ENABLE_MBEDTLS 0
 #endif

src/net.c

@@ -237,7 +237,7 @@ void mg_mgr_free(struct mg_mgr *mgr) {
   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_ARCH == MG_ARCH_FREERTOS_TCP
+#if MG_ENABLE_FREERTOS_TCP
   FreeRTOS_DeleteSocketSet(mgr->ss);
 #endif
   MG_DEBUG(("All connections closed"));
@@ -258,7 +258,7 @@ void mg_mgr_init(struct mg_mgr *mgr) {
   // clang-format off
   { WSADATA data; WSAStartup(MAKEWORD(2, 2), &data); }
   // clang-format on
-#elif MG_ARCH == MG_ARCH_FREERTOS_TCP
+#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

src/net.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "arch.h"
+#include "config.h"
 #include "event.h"
 #include "iobuf.h"
 #include "str.h"
@@ -33,7 +34,7 @@ struct mg_mgr {
   int epoll_fd;                 // Used when MG_EPOLL_ENABLE=1
   void *priv;                   // Used by the MIP stack
   size_t extraconnsize;         // Used by the MIP stack
-#if MG_ARCH == MG_ARCH_FREERTOS_TCP
+#if MG_ENABLE_FREERTOS_TCP
   SocketSet_t ss;  // NOTE(lsm): referenced from socket struct
 #endif
 };

src/net_ft.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if MG_ARCH == MG_ARCH_FREERTOS_TCP
+#if defined(MG_ENABLE_FREERTOS_TCP) && MG_ENABLE_FREERTOS_TCP
 
 #include <ctype.h>
 #include <errno.h>
@@ -50,45 +50,16 @@
   FreeRTOS_recvfrom((a), (b), (c), (d), (e), (f))
 #define closesocket(x) FreeRTOS_closesocket(x)
 #define gethostbyname(x) FreeRTOS_gethostbyname(x)
-#define getsockname(a, b, c) (-1)
-#define getpeername(a, b, c) 0
+#define getsockname(a, b, c) mg_getsockname((a), (b), (c))
+#define getpeername(a, b, c) mg_getpeername((a), (b), (c))
 
-// Re-route calloc/free to the FreeRTOS's functions, don't use stdlib
-static inline void *mg_calloc(int cnt, size_t size) {
-  void *p = pvPortMalloc(cnt * size);
-  if (p != NULL) memset(p, 0, size * cnt);
-  return p;
+static inline int mg_getsockname(MG_SOCKET_TYPE fd, void *buf, socklen_t *len) {
+  (void) fd, (void) buf, (void) len;
+  return -1;
 }
-#define calloc(a, b) mg_calloc((a), (b))
-#define free(a) vPortFree(a)
-#define malloc(a) pvPortMalloc(a)
-#define mkdir(a, b) (-1)
 
-#if !defined(__GNUC__)
-// copied from GCC on ARM; for some reason useconds are signed
-struct timeval {
-  time_t tv_sec;
-  long tv_usec;
-};
+static inline int mg_getpeername(MG_SOCKET_TYPE fd, void *buf, socklen_t *len) {
+  (void) fd, (void) buf, (void) len;
+  return 0;
+}
 #endif
-
-#ifndef EINPROGRESS
-#define EINPROGRESS pdFREERTOS_ERRNO_EINPROGRESS
-#endif
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK pdFREERTOS_ERRNO_EWOULDBLOCK
-#endif
-#ifndef EAGAIN
-#define EAGAIN pdFREERTOS_ERRNO_EAGAIN
-#endif
-#ifndef EINTR
-#define EINTR pdFREERTOS_ERRNO_EINTR
-#endif
-
-// FreeRTOS-TCP uses non-standard semantics for listen() backlog size. It is
-// not a backlog size for pending SYN connections, but a max socket number
-#ifndef MG_SOCK_LISTEN_BACKLOG_SIZE
-#define MG_SOCK_LISTEN_BACKLOG_SIZE 128
-#endif
-
-#endif  // MG_ARCH == MG_ARCH_FREERTOS_TCP

src/net_lwip.h

@@ -1,14 +1,6 @@
 #pragma once
 
-#if MG_ARCH == MG_ARCH_RTX_LWIP
-
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
+#if defined(MG_ENABLE_LWIP) && MG_ENABLE_LWIP
 #if defined(__GNUC__)
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -25,16 +17,4 @@ struct timeval {
 // Sockets support disabled in LWIP by default
 #error Set LWIP_SOCKET variable to 1 (in lwipopts.h)
 #endif
-
-#define mkdir(a, b) (-1)
-
-#ifndef MG_IO_SIZE
-#define MG_IO_SIZE 512
-#endif
-
-#ifndef MG_PATH_MAX
-#define MG_PATH_MAX 128
-#endif
-
-
 #endif

src/net_rl.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#if defined(MG_ENABLE_RL) && MG_ENABLE_RL
+#include <rl_net.h>
+
+#define MG_ENABLE_CUSTOM_MILLIS 1
+#define closesocket(x) closesocket(x)
+#define mkdir(a, b) (-1)
+#define EWOULDBLOCK BSD_EWOULDBLOCK
+#define EAGAIN BSD_EWOULDBLOCK
+#define EINPROGRESS BSD_EWOULDBLOCK
+#define EINTR BSD_EWOULDBLOCK
+#define ECONNRESET BSD_ECONNRESET
+#define EPIPE BSD_ECONNRESET
+#define TCP_NODELAY SO_KEEPALIVE
+#endif

src/sock.c

@@ -136,7 +136,7 @@ long mg_io_send(struct mg_connection *c, const void *buf, size_t len) {
   } else {
     n = send(FD(c), (char *) buf, len, MSG_NONBLOCKING);
 #if MG_ARCH == MG_ARCH_RTX
-    if (n == BSD_EWOULDBLOCK) return MG_IO_WAIT;
+    if (n == EWOULDBLOCK) return MG_IO_WAIT;
 #endif
   }
   if (n < 0 && mg_sock_would_block()) return MG_IO_WAIT;
@@ -166,11 +166,11 @@ static void mg_set_non_blocking_mode(MG_SOCKET_TYPE fd) {
 #elif MG_ARCH == MG_ARCH_RTX
   unsigned long on = 1;
   ioctlsocket(fd, FIONBIO, &on);
-#elif MG_ARCH == MG_ARCH_FREERTOS_TCP
+#elif MG_ENABLE_FREERTOS_TCP
   const BaseType_t off = 0;
   if (setsockopt(fd, 0, FREERTOS_SO_RCVTIMEO, &off, sizeof(off)) != 0) (void) 0;
   if (setsockopt(fd, 0, FREERTOS_SO_SNDTIMEO, &off, sizeof(off)) != 0) (void) 0;
-#elif MG_ARCH == MG_ARCH_FREERTOS_LWIP || MG_ARCH == MG_ARCH_RTX_LWIP
+#elif MG_ENABLE_LWIP
   lwip_fcntl(fd, F_SETFL, O_NONBLOCK);
 #elif MG_ARCH == MG_ARCH_AZURERTOS
   fcntl(fd, F_SETFL, O_NONBLOCK);
@@ -298,7 +298,7 @@ static void close_conn(struct mg_connection *c) {
     epoll_ctl(c->mgr->epoll_fd, EPOLL_CTL_DEL, FD(c), NULL);
 #endif
     closesocket(FD(c));
-#if MG_ARCH == MG_ARCH_FREERTOS_TCP
+#if MG_ENABLE_FREERTOS_TCP
     FreeRTOS_FD_CLR(c->fd, c->mgr->ss, eSELECT_ALL);
 #endif
   }
@@ -320,7 +320,7 @@ static void connect_conn(struct mg_connection *c) {
 }
 
 static void setsockopts(struct mg_connection *c) {
-#if MG_ARCH == MG_ARCH_FREERTOS_TCP || MG_ARCH == MG_ARCH_AZURERTOS || \
+#if MG_ENABLE_FREERTOS_TCP || MG_ARCH == MG_ARCH_AZURERTOS || \
     MG_ARCH == MG_ARCH_TIRTOS
   (void) c;
 #else
@@ -348,7 +348,8 @@ void mg_connect_resolved(struct mg_connection *c) {
 #if MG_ARCH == MG_ARCH_TIRTOS
     union usa usa;  // TI-RTOS NDK requires binding to receive on UDP sockets
     socklen_t slen = tousa(&c->loc, &usa);
-    if (bind(c->fd, &usa.sa, slen) != 0) MG_ERROR(("bind: %d", MG_SOCKET_ERRNO));
+    if (bind(c->fd, &usa.sa, slen) != 0)
+      MG_ERROR(("bind: %d", MG_SOCKET_ERRNO));
 #endif
     mg_call(c, MG_EV_RESOLVE, NULL);
     mg_call(c, MG_EV_CONNECT, NULL);
@@ -372,7 +373,8 @@ void mg_connect_resolved(struct mg_connection *c) {
   (void) rc;
 }
 
-static MG_SOCKET_TYPE raccept(MG_SOCKET_TYPE sock, union usa *usa, socklen_t len) {
+static MG_SOCKET_TYPE raccept(MG_SOCKET_TYPE sock, union usa *usa,
+                              socklen_t len) {
   MG_SOCKET_TYPE s = MG_INVALID_SOCKET;
   do {
     memset(usa, 0, sizeof(*usa));
@@ -394,8 +396,8 @@ static void accept_conn(struct mg_mgr *mgr, struct mg_connection *lsn) {
     if (MG_SOCKET_ERRNO != EAGAIN)
 #endif
       MG_ERROR(("%lu accept failed, errno %d", lsn->id, MG_SOCKET_ERRNO));
-#if (MG_ARCH != MG_ARCH_WIN32) && (MG_ARCH != MG_ARCH_FREERTOS_TCP) && \
-    (MG_ARCH != MG_ARCH_TIRTOS) && !(MG_ENABLE_POLL)
+#if (MG_ARCH != MG_ARCH_WIN32) && !MG_ENABLE_FREERTOS_TCP && \
+    (MG_ARCH != MG_ARCH_TIRTOS) && !MG_ENABLE_POLL
   } else if ((long) fd >= FD_SETSIZE) {
     MG_ERROR(("%ld > %ld", (long) fd, (long) FD_SETSIZE));
     closesocket(fd);
@@ -499,7 +501,7 @@ static bool skip_iotest(const struct mg_connection *c) {
 }
 
 static void mg_iotest(struct mg_mgr *mgr, int ms) {
-#if MG_ARCH == MG_ARCH_FREERTOS_TCP
+#if MG_ENABLE_FREERTOS_TCP
   struct mg_connection *c;
   for (c = mgr->conns; c != NULL; c = c->next) {
     c->is_readable = c->is_writable = 0;
@@ -511,8 +513,8 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
   FreeRTOS_select(mgr->ss, pdMS_TO_TICKS(ms));
   for (c = mgr->conns; c != NULL; c = c->next) {
     EventBits_t bits = FreeRTOS_FD_ISSET(c->fd, mgr->ss);
-    c->is_readable = bits & (eSELECT_READ | eSELECT_EXCEPT) ? 1 : 0;
-    c->is_writable = bits & eSELECT_WRITE ? 1 : 0;
+    c->is_readable = bits & (eSELECT_READ | eSELECT_EXCEPT) ? 1U : 0;
+    c->is_writable = bits & eSELECT_WRITE ? 1U : 0;
     FreeRTOS_FD_CLR(c->fd, mgr->ss,
                     eSELECT_READ | eSELECT_EXCEPT | eSELECT_WRITE);
   }

src/util.c

@@ -96,9 +96,7 @@ uint64_t mg_millis(void) {
   return time_us_64() / 1000;
 #elif MG_ARCH == MG_ARCH_ESP32
   return esp_timer_get_time() / 1000;
-#elif MG_ARCH == MG_ARCH_ESP8266
-  return xTaskGetTickCount() * portTICK_PERIOD_MS;
-#elif MG_ARCH == MG_ARCH_FREERTOS_TCP || MG_ARCH == MG_ARCH_FREERTOS_LWIP
+#elif MG_ARCH == MG_ARCH_ESP8266 || MG_ARCH == MG_ARCH_FREERTOS
   return xTaskGetTickCount() * portTICK_PERIOD_MS;
 #elif MG_ARCH == MG_ARCH_AZURERTOS
   return tx_time_get() * (1000 /* MS per SEC */ / TX_TIMER_TICKS_PER_SECOND);