From: Selva Nair <selva.n...@gmail.com>
Without this, replies to commands from the management client
are sometimes lost if the server is writing when a command
comes in and leads to a recursive call to this function.
For some reason I've not been able to trigger this on Linux,
but it does sometimes happen on Windows during intense write
activity by openvpn.exe sending log lines to the management
client.
Signed-off-by: Selva Nair <selva.n...@gmail.com>
---
src/openvpn/manage.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 27aa49a8..5670e594 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -312,8 +312,7 @@ virtual_output_callback_func(void *arg, const unsigned int
flags, const char *st
#define AF_DID_PUSH (1<<0)
#define AF_DID_RESET (1<<1)
-
- if (!recursive_level) /* don't allow recursion */
+ if (recursive_level < 5) /* limit recursion */
{
struct gc_arena gc = gc_new();
struct log_entry e;
@@ -380,6 +379,12 @@ virtual_output_callback_func(void *arg, const unsigned int
flags, const char *st
--recursive_level;
}
+ else
+ {
+ /* cannot use msg here */
+ printf("virtual_output: message to management interface "
+ "dropped due to recursion: <%s>\n", str);
+ }
}
/*
--
2.30.2
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
