]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Update expiry date in management event loop
authorThomas Veerman <thomas.veerman@wanwire.net>
Wed, 22 Jan 2014 08:27:29 +0000 (09:27 +0100)
committerGert Doering <gert@greenie.muc.de>
Sat, 10 Oct 2015 10:36:40 +0000 (12:36 +0200)
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>
src/openvpn/manage.c

index d02dac9c6acfdf5794538b460ae65eab283aeaa6..97d6f0fa240954fa3935a607223ba49f287e4846 100644 (file)
@@ -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;