diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-10-20 19:17:07 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-10-20 19:17:07 +0200 |
| commit | 63934be0e9a494086d103bc3ba43c444b5460b5b (patch) | |
| tree | e2b5876072df6d56023d21a66379544e2bef9d5f /src/openvpn/manage.c | |
| parent | 4ca7910f8fbd80a28780cff34d27b481ae882f67 (diff) | |
| parent | 80285c31e83a8e233016e227a393543d508194eb (diff) | |
Update upstream source from tag 'upstream/2.5_rc3'
Update to upstream version '2.5~rc3'
with Debian dir 654a857be97a3895ea7ff814fea7c3f9f80e8794
Diffstat (limited to 'src/openvpn/manage.c')
| -rw-r--r-- | src/openvpn/manage.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 898cb3b..ac14217 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -3310,12 +3310,17 @@ man_block(struct management *man, volatile int *signal_received, const time_t ex if (man_standalone_ok(man)) { + /* expire time can be already overdue, for this case init zero + * timeout to avoid waiting first time and exit loop early with + * either obtained event or timeout. + */ + tv.tv_usec = 0; + tv.tv_sec = 0; + while (true) { event_reset(man->connection.es); management_socket_set(man, man->connection.es, NULL, NULL); - tv.tv_usec = 0; - tv.tv_sec = 1; if (man_check_for_signals(signal_received)) { status = -1; @@ -3343,6 +3348,10 @@ man_block(struct management *man, volatile int *signal_received, const time_t ex } break; } + + /* wait one second more */ + tv.tv_sec = 1; + tv.tv_usec = 0; } } return status; @@ -3444,7 +3453,7 @@ management_event_loop_n_seconds(struct management *man, int sec) /* set expire time */ update_time(); - if (sec) + if (sec >= 0) { expire = now + sec; } @@ -3474,7 +3483,7 @@ management_event_loop_n_seconds(struct management *man, int sec) /* revert state */ man->persist.standalone_disabled = standalone_disabled_save; } - else + else if (sec > 0) { sleep(sec); } @@ -4117,11 +4126,15 @@ log_history_ref(const struct log_history *h, const int index) void management_sleep(const int n) { - if (management) + if (n < 0) + { + return; + } + else if (management) { management_event_loop_n_seconds(management, n); } - else + else if (n > 0) { sleep(n); } @@ -4132,7 +4145,10 @@ management_sleep(const int n) void management_sleep(const int n) { - sleep(n); + if (n > 0) + { + sleep(n); + } } #endif /* ENABLE_MANAGEMENT */ |