diff mbox series

[Openvpn-devel,XS] Change in openvpn[master]: Fix for msbuild/mingw GHA failures

Message ID 63d4a5e2c940a336b4ad361084ae02a7c6b6552f-HTML@gerrit.openvpn.net
State Superseded
Headers show
Series [Openvpn-devel,XS] Change in openvpn[master]: Fix for msbuild/mingw GHA failures | expand

Commit Message

its_Giaan (Code Review) Oct. 23, 2024, 11:05 a.m. UTC 
Attention is currently required from: flichtenheld, plaisthos.

Hello plaisthos, flichtenheld,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/785?usp=email

to review the following change.


Change subject: Fix for msbuild/mingw GHA failures
......................................................................

Fix for msbuild/mingw GHA failures

Commit ("event/multi: add event_arg object to make
event handling more generic") accidentally removed
a variable declaration and its usage because of a
rebase, this fix restore the wiped out
unsigned int *persistent in multi_tcp_wait().

Change-Id: I8526aadb5151ddc997c836d5a691bcdfee700938
Signed-off-by: Gianmarco De Gregori <gianmarco@mandelbit.com>
---
M src/openvpn/mtcp.c
1 file changed, 2 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/85/785/1
diff mbox series

Patch

diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 67e3e8e..6faf45a 100644
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -254,6 +254,7 @@ 
                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 @@ 
         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