flichtenheld has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/201?usp=email )
Change subject: Fix '--inactive <time> 0' behavior for DCO ...................................................................... Fix '--inactive <time> 0' behavior for DCO Make sure we exit if <bytes> is 0 (not set) and no traffic was produced. According to man page and non-DCO --inactive implementation, we exit if amount of bytes produced is less than <bytes> specified. DCO implementation will do off-by-ones, but we consider it as okay since we don't want to complicate code to handle both bytes=0 and >0 cases. Change-Id: I4c089e486728a43bfe42596787c00355838311da Signed-off-by: Lev Stipakov <l...@openvpn.net> Acked-by: Gert Doering <g...@greenie.muc.de> Message-Id: <20230322113408.2057-1-lstipa...@gmail.com> URL: https://www.mail-archive.com/search?l=mid&q=20230322113408.2057-1-lstipa...@gmail.com Signed-off-by: Gert Doering <g...@greenie.muc.de> (cherry picked from commit 6c64b46b15476351ca19f9a8f3cb8185aa2c7e07) --- M src/openvpn/forward.c 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 28a96f9..b3e0ba5 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -481,7 +481,7 @@ int64_t tot_bytes = c->c2.tun_read_bytes + c->c2.tun_write_bytes; int64_t new_bytes = tot_bytes - c->c2.inactivity_bytes; - if (new_bytes >= c->options.inactivity_minimum_bytes) + if (new_bytes > c->options.inactivity_minimum_bytes) { c->c2.inactivity_bytes = tot_bytes; event_timeout_reset(&c->c2.inactivity_interval); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/201?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: release/2.6 Gerrit-Change-Id: I4c089e486728a43bfe42596787c00355838311da Gerrit-Change-Number: 201 Gerrit-PatchSet: 2 Gerrit-Owner: stipa <lstipa...@gmail.com> Gerrit-Reviewer: cron2 Gerrit-Reviewer: d12fk <he...@openvpn.net> Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com> Gerrit-Reviewer: ordex <a...@unstable.cc> Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org> Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net> Gerrit-MessageType: merged
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
