diff options
| author | Lev Stipakov | 2023-03-22 13:34:08 +0200 |
|---|---|---|
| committer | Gert Doering | 2023-03-22 13:47:25 +0100 |
| commit | a3c9458d233d35d2afdb866aaa602bebaabf2f59 (patch) | |
| tree | 2c73b57f8b0b9ecee5793efe84bfd768c0e90508 | |
| parent | 3b967e7e05f679203ce26e027fcea5f7b4709eaa (diff) | |
| download | openvpn-a3c9458d233d35d2afdb866aaa602bebaabf2f59.zip openvpn-a3c9458d233d35d2afdb866aaa602bebaabf2f59.tar.gz | |
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 <lev@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20230322113408.2057-1-lstipakov@gmail.com>
URL: https://www.mail-archive.com/search?l=mid&q=20230322113408.2057-1-lstipakov@gmail.com
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 6c64b46b15476351ca19f9a8f3cb8185aa2c7e07)
| -rw-r--r-- | src/openvpn/forward.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ check_inactivity_timeout(struct context *c) 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); |