From: Thomas Veerman <thomas.veerman@wanwire.net>
Date: Wed, 22 Jan 2014 08:27:29 +0000 (+0100)
Subject: Update expiry date in management event loop
X-Git-Tag: v2.4_alpha1~225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b51a024a7b26e691e6459964d4d29f15b70089bd;p=thirdparty%2Fopenvpn.git

Update expiry date in management event loop

When there are events from the management console with an interval shorter
than 1 second, the event loop never stops as it keeps resetting event_wait.

Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <etPan.52df80ec.2901d82.13bb7@Bert-3.local>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8253

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index d02dac9c6..97d6f0fa2 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -3015,7 +3015,8 @@ management_event_loop_n_seconds (struct management *man, int sec)
 	    man_check_for_signals (&signal_received);
 	  if (signal_received)
 	    return;
-	} while (expire);
+	  update_time();
+	} while (expire && expire > now);
 
       /* revert state */
       man->persist.standalone_disabled = standalone_disabled_save;