cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/785?usp=email )
Change subject: Fix for msbuild/mingw GHA failures ...................................................................... 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 <[email protected]> Acked-by: Gert Doering <[email protected]> Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg29612.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/mtcp.c 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/785?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I8526aadb5151ddc997c836d5a691bcdfee700938 Gerrit-Change-Number: 785 Gerrit-PatchSet: 2 Gerrit-Owner: its_Giaan <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: flichtenheld <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]> Gerrit-MessageType: merged
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
