Attention is currently required from: plaisthos, ralf_lici, stipa.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1113?usp=email
to look at the new patch set (#4).
Change subject: management: resync timer on bytecount interval change
......................................................................
management: resync timer on bytecount interval change
coarse_timer_wakeup tracks when the next timer-driven task will occur.
If a user issues `bytecount n` via the management interface, but the
next scheduled wakeup is more than n seconds away, bandwidth logging
will be delayed until that timer fires.
To ensure timely logging, reset the timer whenever a new `bytecount`
command is received. This guarantees that logging begins exactly n
seconds after the command, matching the user-defined interval.
Change-Id: Ic0035d52e0ea123398318870d2f4d21af927a602
Signed-off-by: Ralf Lici <[email protected]>
---
M src/openvpn/manage.c
1 file changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/13/1113/4
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index aed04f5..92c5500 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -41,6 +41,7 @@
#include "manage.h"
#include "openvpn.h"
#include "dco.h"
+#include "multi.h"
#include "memdbg.h"
@@ -513,6 +514,27 @@
man->connection.bytecount_update_seconds = 0;
event_timeout_clear(&man->connection.bytecount_update_interval);
}
+
+ /* The newly received bytecount interval may be sooner than the existing
+ * coarse timer wakeup. Reset the timer to ensure it fires at the correct,
+ * earlier time.
+ */
+ ASSERT(man->persist.callback.arg);
+
+ struct context *c;
+
+ if (man->settings.flags & MF_SERVER)
+ {
+ struct multi_context *m = man->persist.callback.arg;
+ c = &m->top;
+ }
+ else
+ {
+ c = man->persist.callback.arg;
+ }
+
+ reset_coarse_timers(c);
+
msg(M_CLIENT, "SUCCESS: bytecount interval changed");
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1113?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic0035d52e0ea123398318870d2f4d21af927a602
Gerrit-Change-Number: 1113
Gerrit-PatchSet: 4
Gerrit-Owner: ralf_lici <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-Reviewer: stipa <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: ralf_lici <[email protected]>
Gerrit-Attention: stipa <[email protected]>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
