diff mbox series

[Openvpn-devel] Support --inactive option for DCO

Message ID 20230313100601.2146-1-lstipakov@gmail.com
State Superseded
Headers
Series [Openvpn-devel] Support --inactive option for DCO |

Commit Message

Lev Stipakov March 13, 2023, 10:06 a.m. UTC 
  From: Lev Stipakov <lev@openvpn.net>

When DCO is in use, userland doesn't see any traffic
which breaks --inactive option.

Fix by adding inactivity check to inactivity timeout
callback. Get the cumulative tun bytes count (ping packets
are excluded) from DCO and compare it to the previous value
stored in c2.inactivity_bytes. Reset inactivity timer and
update c2.inactivity_bytes if amount of new bytes exceeds
inactivity_minimum_bytes, otherwise terminate session
due to inactivity.

Fixes https://github.com/OpenVPN/openvpn/issues/228

Currently works only on Windows, since we do't have
since peer stats implementation yet for Linux and FreeBSD.

Change-Id: Ib417b965bc4a2c17b51935b43c9627b106716526
Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 src/openvpn/dco_win.c |  2 ++
 src/openvpn/forward.c | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

Comments

Lev Stipakov March 13, 2023, 10:19 a.m. UTC | #1 
Review happens at https://gerrit.openvpn.net/c/openvpn/+/143

ma 13. maalisk. 2023 klo 12.06 Lev Stipakov (lstipakov@gmail.com) kirjoitti:
>
> From: Lev Stipakov <lev@openvpn.net>
>
> When DCO is in use, userland doesn't see any traffic
> which breaks --inactive option.
>
> Fix by adding inactivity check to inactivity timeout
> callback. Get the cumulative tun bytes count (ping packets
> are excluded) from DCO and compare it to the previous value
> stored in c2.inactivity_bytes. Reset inactivity timer and
> update c2.inactivity_bytes if amount of new bytes exceeds
> inactivity_minimum_bytes, otherwise terminate session
> due to inactivity.
>
> Fixes https://github.com/OpenVPN/openvpn/issues/228
>
> Currently works only on Windows, since we do't have
> since peer stats implementation yet for Linux and FreeBSD.
>
> Change-Id: Ib417b965bc4a2c17b51935b43c9627b106716526
> Signed-off-by: Lev Stipakov <lev@openvpn.net>
> ---
>  src/openvpn/dco_win.c |  2 ++
>  src/openvpn/forward.c | 20 +++++++++++++++++++-
>  2 files changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c
> index 0931fb30..aae6b4b5 100644
> --- a/src/openvpn/dco_win.c
> +++ b/src/openvpn/dco_win.c
> @@ -431,6 +431,8 @@ dco_get_peer_stats(struct context *c)
>
>      c->c2.dco_read_bytes = stats.TransportBytesReceived;
>      c->c2.dco_write_bytes = stats.TransportBytesSent;
> +    c->c2.tun_read_bytes = stats.TunBytesReceived;
> +    c->c2.tun_write_bytes = stats.TunBytesSent;
>
>      return 0;
>  }
> diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
> index 257c7c75..21800dc9 100644
> --- a/src/openvpn/forward.c
> +++ b/src/openvpn/forward.c
> @@ -724,7 +724,25 @@ process_coarse_timers(struct context *c)
>      if (c->options.inactivity_timeout
>          && event_timeout_trigger(&c->c2.inactivity_interval, &c->c2.timeval, ETT_DEFAULT))
>      {
> -        check_inactivity_timeout(c);
> +        if (dco_enabled(&c->options) && dco_get_peer_stats(c) == 0)
> +        {
> +            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)
> +            {
> +                c->c2.inactivity_bytes = tot_bytes;
> +                event_timeout_reset(&c->c2.inactivity_interval);
> +            }
> +            else
> +            {
> +                check_inactivity_timeout(c);
> +            }
> +        }
> +        else
> +        {
> +            check_inactivity_timeout(c);
> +        }
>      }
>
>      if (c->sig->signal_received)
> --
> 2.23.0.windows.1
>
diff mbox series

Patch

diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c
index 0931fb30..aae6b4b5 100644
--- a/src/openvpn/dco_win.c
+++ b/src/openvpn/dco_win.c
@@ -431,6 +431,8 @@  dco_get_peer_stats(struct context *c)
 
     c->c2.dco_read_bytes = stats.TransportBytesReceived;
     c->c2.dco_write_bytes = stats.TransportBytesSent;
+    c->c2.tun_read_bytes = stats.TunBytesReceived;
+    c->c2.tun_write_bytes = stats.TunBytesSent;
 
     return 0;
 }
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index 257c7c75..21800dc9 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -724,7 +724,25 @@  process_coarse_timers(struct context *c)
     if (c->options.inactivity_timeout
         && event_timeout_trigger(&c->c2.inactivity_interval, &c->c2.timeval, ETT_DEFAULT))
     {
-        check_inactivity_timeout(c);
+        if (dco_enabled(&c->options) && dco_get_peer_stats(c) == 0)
+        {
+            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)
+            {
+                c->c2.inactivity_bytes = tot_bytes;
+                event_timeout_reset(&c->c2.inactivity_interval);
+            }
+            else
+            {
+                check_inactivity_timeout(c);
+            }
+        }
+        else
+        {
+            check_inactivity_timeout(c);
+        }
     }
 
     if (c->sig->signal_received)