diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-29 14:11:02 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-29 14:11:02 +0200 |
| commit | 64639e6dd78c89be61bbffeefcbd7a8d1e38178f (patch) | |
| tree | 828e090fe91751afd157fb1ceb48c153dcb6568b /src/openvpn/interval.c | |
| parent | 3408a277eb3293c0c29d50c66b42727ad31181aa (diff) | |
| parent | 53de4f8356a1c5d5b2f0903499087adcc8854c57 (diff) | |
Merge branch 'feature/upstream' into develop
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; |