cron2 has uploaded a new patch set (#10) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1311?usp=email )
The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: multi: Fix wrong sigma value in multi_push_restart_schedule_exit ...................................................................... multi: Fix wrong sigma value in multi_push_restart_schedule_exit Sigma was computed based on the absolute time and not the delta. Note that this probably makes no actual difference in practice. The sigma value is irrelevant on first call and multi_push_restart_schedule_exit should not be called multiple times since it is only called if deferred_shutdown_signal.signal_received is not set, yet. Change-Id: I62b8263f18c4e2e7f5ecacb4616737f5ba836303 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1311 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg35075.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/multi.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/11/1311/10 diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index d2d9ba8e..d9cb3a9 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3820,7 +3820,6 @@ { struct hash_iterator hi; struct hash_element *he; - struct timeval tv; /* tell all clients to restart */ hash_iterator_init(m->iter, &hi); @@ -3838,15 +3837,14 @@ /* reschedule signal */ ASSERT(!openvpn_gettimeofday(&m->deferred_shutdown_signal.wakeup, NULL)); - tv.tv_sec = 2; - tv.tv_usec = 0; + struct timeval tv = { .tv_sec = 2, .tv_usec = 0 }; tv_add(&m->deferred_shutdown_signal.wakeup, &tv); m->deferred_shutdown_signal.signal_received = m->top.sig->signal_received; schedule_add_entry(m->schedule, (struct schedule_entry *)&m->deferred_shutdown_signal, &m->deferred_shutdown_signal.wakeup, - compute_wakeup_sigma(&m->deferred_shutdown_signal.wakeup)); + compute_wakeup_sigma(&tv)); signal_reset(m->top.sig, 0); } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1311?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I62b8263f18c4e2e7f5ecacb4616737f5ba836303 Gerrit-Change-Number: 1311 Gerrit-PatchSet: 10 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
