GitList

Browse code

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>

Gianmarco De Gregori authored on 2025/05/19 02:23:23
Showing 1 changed files

src/openvpn/multi.c index a2d3fd1..80dd0c0 100644

src/openvpn/multi.c

History View file @ 565d7cf

@@ -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();
     }
 }

...	...	@@ -4271,13 +4271,13 @@ tunnel_server_loop(struct multi_context *multi)
4271	4271	{
4272	4272	/* process the I/O which triggered select */
4273	4273	multi_io_process_io(multi);
4274		- MULTI_CHECK_SIG(multi);
4275	4274	}
4276	4275	else if (status == 0)
4277	4276	{
4278	4277	multi_io_action(multi, NULL, TA_TIMEOUT, false);
4279	4278	}
4280	4279
	4280	+ MULTI_CHECK_SIG(multi);
4281	4281	perf_pop();
4282	4282	}
4283	4283	}