From 3636da3b0f168d8e06a00ec5d1f33e4b9aded262 Mon Sep 17 00:00:00 2001 From: Gianmarco De Gregori Date: Wed, 23 Oct 2024 13:39:23 +0200 Subject: [PATCH] Fix for msbuild/mingw GHA failures Commit cd8e25a6e9 removed a variable because it looked as if used only once anyway (1 assignment, 1 usage) - overlooking that on _WIN32 it's changed to NULL, which wasn't adjusted... This fix restores the wiped out "unsigned int *persistent" in multi_tcp_wait(), undoing this particular change of the previous commit. Change-Id: I8526aadb5151ddc997c836d5a691bcdfee700938 Signed-off-by: Gianmarco De Gregori Acked-by: Gert Doering Message-Id: <20241023113923.7420-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29612.html Signed-off-by: Gert Doering --- src/openvpn/mtcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 67e3e8e26..6faf45a8c 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -254,6 +254,7 @@ multi_tcp_wait(const struct context *c, struct multi_tcp *mtcp) { int status; + unsigned int *persistent = &mtcp->tun_rwflags; socket_set_listen_persistent(c->c2.link_socket, mtcp->es, &c->c2.link_socket->ev_arg); @@ -271,7 +272,7 @@ multi_tcp_wait(const struct context *c, persistent = NULL; } #endif - tun_set(c->c1.tuntap, mtcp->es, EVENT_READ, MTCP_TUN, &mtcp->tun_rwflags); + tun_set(c->c1.tuntap, mtcp->es, EVENT_READ, MTCP_TUN, persistent); #if defined(TARGET_LINUX) || defined(TARGET_FREEBSD) dco_event_set(&c->c1.tuntap->dco, mtcp->es, MTCP_DCO); #endif -- 2.47.2