diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-29 13:59:02 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-29 13:59:02 +0200 |
| commit | 2c8e4bc4f9ab94e4d0b63341820d471af7c28c6c (patch) | |
| tree | fa0ea07bdd1ac4caab9a9642631f2b2450834894 /src/openvpn/interval.c | |
| parent | 4afa7ed562410a1170223a7bc06efb3708af6a36 (diff) | |
New upstream version 2.4.6upstream/2.4.6
Diffstat (limited to 'src/openvpn/interval.c')
| -rw-r--r-- | src/openvpn/interval.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/openvpn/interval.c b/src/openvpn/interval.c index 00ee627..b728560 100644 --- a/src/openvpn/interval.c +++ b/src/openvpn/interval.c @@ -51,11 +51,12 @@ event_timeout_trigger(struct event_timeout *et, if (et->defined) { - int wakeup = (int) et->last + et->n - local_now; + time_t wakeup = et->last - local_now + et->n; if (wakeup <= 0) { #if INTERVAL_DEBUG - dmsg(D_INTERVAL, "EVENT event_timeout_trigger (%d) etcr=%d", et->n, et_const_retry); + dmsg(D_INTERVAL, "EVENT event_timeout_trigger (%d) etcr=%d", et->n, + et_const_retry); #endif if (et_const_retry < 0) { @@ -72,7 +73,8 @@ event_timeout_trigger(struct event_timeout *et, if (tv && wakeup < tv->tv_sec) { #if INTERVAL_DEBUG - dmsg(D_INTERVAL, "EVENT event_timeout_wakeup (%d/%d) etcr=%d", wakeup, et->n, et_const_retry); + dmsg(D_INTERVAL, "EVENT event_timeout_wakeup (%d/%d) etcr=%d", + (int) wakeup, et->n, et_const_retry); #endif tv->tv_sec = wakeup; tv->tv_usec = 0; |