[Openvpn-devel,v1] dco_linux: allow passing KEEPALIVE_TIMEOUT without KEEPALIVE_INTERVAL

Message ID 20260605181053.3774-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v1] dco_linux: allow passing KEEPALIVE_TIMEOUT without KEEPALIVE_INTERVAL | expand

Commit Message

Gert Doering June 5, 2026, 6:10 p.m. UTC
From: Marco Baffo <marco@mandelbit.com>

Depends on: https://github.com/OpenVPN/ovpn-net-next/commit/67f453e3146a646ef5f811e5a85c610537d80521

Closes: https://github.com/OpenVPN/openvpn/issues/911

Change-Id: Ib56fb53ec1c0c30c9aecbd0ca440de2affad04b5
Signed-off-by: Marco Baffo <marco@mandelbit.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1705
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1705
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>

Patch

diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index d332359c..0998bd6 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -1623,9 +1623,9 @@ 
 
     if (dco_enabled(options))
     {
-        /* dco_set_peer() must be called if either keepalive or
-         * mssfix are set to update in-kernel config */
-        if (options->ping_send_timeout || frame->mss_fix)
+        /* dco_set_peer() must be called if either keepalive, ping, ping-restart,
+         * ping-exit or mssfix are set to update in-kernel config */
+        if (options->ping_send_timeout || options->ping_rec_timeout || frame->mss_fix)
         {
             int ret = dco_set_peer(dco, multi->dco_peer_id, options->ping_send_timeout,
                                    options->ping_rec_timeout, frame->mss_fix);