[XS] Change in openvpn[master]: dco_linux: allow passing KEEPALIVE_TIMEOUT without KEEPALIVE_INTERVAL

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1705?usp=email )

Change subject: dco_linux: allow passing KEEPALIVE_TIMEOUT without KEEPALIVE_INTERVAL
......................................................................

dco_linux: allow passing KEEPALIVE_TIMEOUT without KEEPALIVE_INTERVAL

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 <[email protected]>
Acked-by: Gert Doering <[email protected]>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1705
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg37070.html
Signed-off-by: Gert Doering <[email protected]>
---
M src/openvpn/ssl.c
1 file changed, 3 insertions(+), 3 deletions(-)




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);

-- 
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1705?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib56fb53ec1c0c30c9aecbd0ca440de2affad04b5
Gerrit-Change-Number: 1705
Gerrit-PatchSet: 2
Gerrit-Owner: mrbff <[email protected]>
Gerrit-Reviewer: cron2 <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>

_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel