MG_IO_SIZE=256 on embedded platforms

tutorials/http/http-client/Makefile

@@ -6,7 +6,7 @@ SOURCES = main.c mongoose.c  packed_fs.c      # Source code files, packed_fs.c c
 CFLAGS = -W -Wall -Wextra -g -I.  # Build options
 
 # Mongoose build options. See https://mongoose.ws/documentation/#build-options
-CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1 -DMG_ENABLE_PACKED_FS=1
+CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1 -DMG_ENABLE_PACKED_FS=1 -DMG_TLS=MG_TLS_BUILTIN
 
 ifeq ($(OS),Windows_NT)   # Windows settings. Assume MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feprog.exe
   PROG ?= example.exe           # Use .exe suffix for the binary

tutorials/http/http-client/packed_fs.c

@@ -2556,7 +2556,7 @@ static const struct packed_file {
   size_t size;
   time_t mtime;
 } packed_files[] = {
-  {"/certs/ca.pem", v1, sizeof(v1), 1713395242},
+  {"/certs/ca.pem", v1, sizeof(v1), 1696845443},
   {NULL, NULL, 0, 0}
 };
 

tutorials/http/http-server/Makefile

@@ -3,10 +3,12 @@ DELETE = rm -rf                   # Command to remove files
 OUT ?= -o $(PROG)                 # Compiler argument for output file
 SOURCES = main.c mongoose.c       # Source code files
 CFLAGS = -W -Wall -Wextra -g -I.  # Build options
+CFLAGS += -fsanitize=address,undefined,alignment
 
 # Mongoose build options. See https://mongoose.ws/documentation/#build-options
 CFLAGS_MONGOOSE += -DMG_HTTP_DIRLIST_TIME_FMT="%Y/%m/%d %H:%M:%S"
 CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1 -DMG_ENABLE_IPV6=1 -DMG_ENABLE_SSI=1
+CFLAGS_MONGOOSE += -DMG_TLS=MG_TLS_BUILTIN
 
 ifeq ($(OS),Windows_NT)   # Windows settings. Assume MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feprog.exe
   PROG ?= example.exe           # Use .exe suffix for the binary

tutorials/http/http-server/main.c

@@ -6,11 +6,43 @@
 
 static int s_debug_level = MG_LL_INFO;
 static const char *s_root_dir = ".";
-static const char *s_listening_address = "http://0.0.0.0:8000";
+static const char *s_addr1 = "http://0.0.0.0:8000";
+static const char *s_addr2 = "https://0.0.0.0:8443";
 static const char *s_enable_hexdump = "no";
 static const char *s_ssi_pattern = "#.html";
 static const char *s_upload_dir = NULL;  // File uploads disabled by default
 
+// Self signed certificates, see
+// https://github.com/cesanta/mongoose/blob/master/test/certs/generate.sh
+#ifdef TLS_TWOWAY
+static const char *s_tls_ca =
+    "-----BEGIN CERTIFICATE-----\n"
+    "MIIBFTCBvAIJAMNTFtpfcq8NMAoGCCqGSM49BAMCMBMxETAPBgNVBAMMCE1vbmdv\n"
+    "b3NlMB4XDTI0MDUwNzE0MzczNloXDTM0MDUwNTE0MzczNlowEzERMA8GA1UEAwwI\n"
+    "TW9uZ29vc2UwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASuP+86T/rOWnGpEVhl\n"
+    "fxYZ+pjMbCmDZ+vdnP0rjoxudwRMRQCv5slRlDK7Lxue761sdvqxWr0Ma6TFGTNg\n"
+    "epsRMAoGCCqGSM49BAMCA0gAMEUCIQCwb2CxuAKm51s81S6BIoy1IcandXSohnqs\n"
+    "us64BAA7QgIgGGtUrpkgFSS0oPBlCUG6YPHFVw42vTfpTC0ySwAS0M4=\n"
+    "-----END CERTIFICATE-----\n";
+#endif
+static const char *s_tls_cert =
+    "-----BEGIN CERTIFICATE-----\n"
+    "MIIBMTCB2aADAgECAgkAluqkgeuV/zUwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwI\n"
+    "TW9uZ29vc2UwHhcNMjQwNTA3MTQzNzM2WhcNMzQwNTA1MTQzNzM2WjARMQ8wDQYD\n"
+    "VQQDDAZzZXJ2ZXIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASo3oEiG+BuTt5y\n"
+    "ZRyfwNr0C+SP+4M0RG2pYkb2v+ivbpfi72NHkmXiF/kbHXtgmSrn/PeTqiA8M+mg\n"
+    "BhYjDX+zoxgwFjAUBgNVHREEDTALgglsb2NhbGhvc3QwCgYIKoZIzj0EAwIDRwAw\n"
+    "RAIgTXW9MITQSwzqbNTxUUdt9DcB+8pPUTbWZpiXcA26GMYCIBiYw+DSFMLHmkHF\n"
+    "+5U3NXW3gVCLN9ntD5DAx8LTG8sB\n"
+    "-----END CERTIFICATE-----\n";
+
+static const char *s_tls_key =
+    "-----BEGIN EC PRIVATE KEY-----\n"
+    "MHcCAQEEIAVdo8UAScxG7jiuNY2UZESNX/KPH8qJ0u0gOMMsAzYWoAoGCCqGSM49\n"
+    "AwEHoUQDQgAEqN6BIhvgbk7ecmUcn8Da9Avkj/uDNERtqWJG9r/or26X4u9jR5Jl\n"
+    "4hf5Gx17YJkq5/z3k6ogPDPpoAYWIw1/sw==\n"
+    "-----END EC PRIVATE KEY-----\n";
+
 // Handle interrupts, like Ctrl-C
 static int s_signo;
 static void signal_handler(int signo) {
@@ -20,6 +52,16 @@ static void signal_handler(int signo) {
 // Event handler for the listening connection.
 // Simply serve static files from `s_root_dir`
 static void cb(struct mg_connection *c, int ev, void *ev_data) {
+  if (ev == MG_EV_ACCEPT && c->fn_data != NULL) {
+    struct mg_tls_opts opts;
+    memset(&opts, 0, sizeof(opts));
+#ifdef TLS_TWOWAY
+    opts.ca = mg_str(s_tls_ca);
+#endif
+    opts.cert = mg_str(s_tls_cert);
+    opts.key = mg_str(s_tls_key);
+    mg_tls_init(c, &opts);
+  }
   if (ev == MG_EV_HTTP_MSG) {
     struct mg_http_message *hm = ev_data;
 
@@ -74,7 +116,7 @@ static void usage(const char *prog) {
           "  -u DIR    - file upload directory, default: unset\n"
           "  -v LEVEL  - debug level, from 0 to 4, default: %d\n",
           MG_VERSION, prog, s_enable_hexdump, s_ssi_pattern, s_root_dir,
-          s_listening_address, s_debug_level);
+          s_addr1, s_debug_level);
   exit(EXIT_FAILURE);
 }
 
@@ -93,7 +135,9 @@ int main(int argc, char *argv[]) {
     } else if (strcmp(argv[i], "-S") == 0) {
       s_ssi_pattern = argv[++i];
     } else if (strcmp(argv[i], "-l") == 0) {
-      s_listening_address = argv[++i];
+      s_addr1 = argv[++i];
+    } else if (strcmp(argv[i], "-l2") == 0) {
+      s_addr2 = argv[++i];
     } else if (strcmp(argv[i], "-u") == 0) {
       s_upload_dir = argv[++i];
     } else if (strcmp(argv[i], "-v") == 0) {
@@ -115,16 +159,22 @@ int main(int argc, char *argv[]) {
   signal(SIGTERM, signal_handler);
   mg_log_set(s_debug_level);
   mg_mgr_init(&mgr);
-  if ((c = mg_http_listen(&mgr, s_listening_address, cb, &mgr)) == NULL) {
+  if ((c = mg_http_listen(&mgr, s_addr1, cb, NULL)) == NULL) {
     MG_ERROR(("Cannot listen on %s. Use http://ADDR:PORT or :PORT",
-              s_listening_address));
+              s_addr1));
+    exit(EXIT_FAILURE);
+  }
+  if ((c = mg_http_listen(&mgr, s_addr2, cb, (void *) 1)) == NULL) {
+    MG_ERROR(("Cannot listen on %s. Use http://ADDR:PORT or :PORT",
+              s_addr2));
     exit(EXIT_FAILURE);
   }
   if (mg_casecmp(s_enable_hexdump, "yes") == 0) c->is_hexdumping = 1;
 
   // Start infinite event loop
   MG_INFO(("Mongoose version : v%s", MG_VERSION));
-  MG_INFO(("Listening on     : %s", s_listening_address));
+  MG_INFO(("HTTP listener    : %s", s_addr1));
+  MG_INFO(("HTTPS listener   : %s", s_addr2));
   MG_INFO(("Web root         : [%s]", s_root_dir));
   MG_INFO(("Upload dir       : [%s]", s_upload_dir ? s_upload_dir : "unset"));
   while (s_signo == 0) mg_mgr_poll(&mgr, 1000);