diff options
author | Thomas Veerman <thomas.veerman@wanwire.net> | 2014-01-22 09:27:29 +0100 |
---|---|---|
committer | Gert Doering <gert@greenie.muc.de> | 2015-10-10 12:36:40 +0200 |
commit | b51a024a7b26e691e6459964d4d29f15b70089bd (patch) | |
tree | e18d8893292e07eedf2626e799d18e97f313db9c /src | |
parent | b05a453be5dd21326e79f42b0a363f2f23eaa29a (diff) | |
download | openvpn-b51a024a7b26e691e6459964d4d29f15b70089bd.tar.gz openvpn-b51a024a7b26e691e6459964d4d29f15b70089bd.tar.xz openvpn-b51a024a7b26e691e6459964d4d29f15b70089bd.zip |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/openvpn/manage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index d02dac9..97d6f0f 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; |