From 1db25117b0bd9988a7116fba697c9bdfe5e0a832 Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Fri, 16 Jan 2026 10:13:20 -0300 Subject: [PATCH] Fix rnd stuff in vc98 image --- .github/workflows/nightly.yml | 2 -- mongoose.c | 2 +- src/net_builtin.c | 2 +- test/Makefile | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index bb77148f..432d9201 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -188,8 +188,6 @@ jobs: exclude: - target: vc98 select: -DMG_ENABLE_POLL=1 - - target: vc98 # see issue#3408 - ssl: BUILTIN name: windows ${{ matrix.target }} SSL=${{ matrix.ssl }} TFLAGS=${{ matrix.select }} env: SSL: ${{ matrix.ssl }} diff --git a/mongoose.c b/mongoose.c index 6305583f..d87f81d0 100644 --- a/mongoose.c +++ b/mongoose.c @@ -5378,7 +5378,7 @@ static void rx_icmp(struct mg_tcpip_if *ifp, struct pkt *pkt) { static void setdns4(struct mg_tcpip_if *ifp, uint32_t *ip); -static inline bool dhcp_opt_len_ok(uint8_t len, uint8_t *p, uint8_t *end) { +static bool dhcp_opt_len_ok(uint8_t len, uint8_t *p, uint8_t *end) { return (len >= 4 && (len & 3) == 0 && p + 6 < end); } diff --git a/src/net_builtin.c b/src/net_builtin.c index d0ba7065..2c525625 100644 --- a/src/net_builtin.c +++ b/src/net_builtin.c @@ -556,7 +556,7 @@ static void rx_icmp(struct mg_tcpip_if *ifp, struct pkt *pkt) { static void setdns4(struct mg_tcpip_if *ifp, uint32_t *ip); -static inline bool dhcp_opt_len_ok(uint8_t len, uint8_t *p, uint8_t *end) { +static bool dhcp_opt_len_ok(uint8_t len, uint8_t *p, uint8_t *end) { return (len >= 4 && (len & 3) == 0 && p + 6 < end); } diff --git a/test/Makefile b/test/Makefile index f9cb0c6f..f42702f5 100644 --- a/test/Makefile +++ b/test/Makefile @@ -93,7 +93,7 @@ mip_tap_test: mip_tap_test.c mongoose.c mongoose.h packed_fs.c Makefile tls_mult mip_vc98: mip_test.c mongoose.c mongoose.h packed_fs.c Makefile $(DOCKER) mdashnet/vc98 wine cl mip_test.c packed_fs.c $(VCFLAGS) $(DEFS) $(TFLAGS) /Fe$@.exe - $(DOCKER) mdashnet/vc98 wine $@.exe + $(DOCKER) -e WINEPREFIX=/tmp/wineprefix mdashnet/vc98 wine $@.exe packed_fs.c: Makefile data/ssi.h fuzz.c data/a.txt data/ca.pem certs/ca.crt certs/server.crt certs/server.key $(CC) $(CFLAGS) pack.c -o pack @@ -194,7 +194,7 @@ riscv: mongoose.h $(SRCS) vc98: Makefile mongoose.h $(SRCS) $(DOCKER) mdashnet/vc98 wine cl $(SRCS) $(VCFLAGS) $(DEFS) $(TFLAGS) /Fe$@.exe - $(DOCKER) mdashnet/vc98 wine $@.exe + $(DOCKER) -e WINEPREFIX=/tmp/wineprefix mdashnet/vc98 wine $@.exe vc17: Makefile mongoose.h $(SRCS) $(DOCKER) mdashnet/vc17 wine64 cl $(SRCS) $(VCFLAGS) $(DEFS) $(TFLAGS) /Fe$@.exe