| Message ID | 20200810143707.5834-13-arne@rfc2549.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | OpenVPN refactoring | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> "Makes sense". Client side and (for completeness) server side tested. Your patch has been applied to the master branch. commit 42b39e987d55150b035c18c8b73c7ec08ef70d19 Author: Arne Schwabe Date: Mon Aug 10 16:37:02 2020 +0200 Merge check_coarse_timers and check_coarse_timers_dowork Signed-off-by: Arne Schwabe <arne@rfc2549.org> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20200810143707.5834-13-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20671.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 36e5c175..7ed8d0d7 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -700,8 +700,14 @@ process_coarse_timers(struct context *c) } static void -check_coarse_timers_dowork(struct context *c) +check_coarse_timers(struct context *c) { + if (now < c->c2.coarse_timer_wakeup) + { + context_reschedule_sec(c, c->c2.coarse_timer_wakeup - now); + return; + } + const struct timeval save = c->c2.timeval; c->c2.timeval.tv_sec = BIG_TIMEOUT; c->c2.timeval.tv_usec = 0; @@ -717,20 +723,6 @@ check_coarse_timers_dowork(struct context *c) } } -static inline void -check_coarse_timers(struct context *c) -{ - const time_t local_now = now; - if (local_now >= c->c2.coarse_timer_wakeup) - { - check_coarse_timers_dowork(c); - } - else - { - context_reschedule_sec(c, c->c2.coarse_timer_wakeup - local_now); - } -} - static void check_timeout_random_component_dowork(struct context *c) {
This simplifies the code a bit and makes the code flow clearer as it only adds three curly brackets in check_coarse_timers. Merging the resulting check_coarse_timers_dowork function into the caller and called function as with the other function does not make sense here since it does more than similar function. Signed-off-by: Arne Schwabe <arne@rfc2549.org> --- src/openvpn/forward.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)