From: Gianmarco De Gregori <gianmarco@mandelbit.com>
Date: Sun, 18 May 2025 17:23:23 +0000 (+0200)
Subject: Explicit-exit-notify and multisocket interaction
X-Git-Tag: v2.7_alpha1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=565d7cf48120d4394258fc3f2aa1b710315cd4e9;p=thirdparty%2Fopenvpn.git

Explicit-exit-notify and multisocket interaction

Check signals after timeout handling to avoid
unusual delay when using explicit-exit-notify.

Github: fixes OpenVPN/openvpn#702

Change-Id: Id9dbb4d3c550bd4c13f6ee97e67749686457d9fc
Signed-off-by: Gianmarco De Gregori <gianmarco@mandelbit.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20250518172329.21239-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31688.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index a2d3fd106..80dd0c041 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -4271,13 +4271,13 @@ tunnel_server_loop(struct multi_context *multi)
         {
             /* process the I/O which triggered select */
             multi_io_process_io(multi);
-            MULTI_CHECK_SIG(multi);
         }
         else if (status == 0)
         {
             multi_io_action(multi, NULL, TA_TIMEOUT, false);
         }
 
+        MULTI_CHECK_SIG(multi);
         perf_pop();
     }
 }