Ensure that dco keepalive and mssfix options are also set in pure p2p mode
PATCH 1/1 Ensure that dco keepalive and mssfix options are also set in pure p2p mode
--- src/openvpn/dco_freebsd.c | 3 +++ src/openvpn/init.c | 42 ++++++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 16 deletions(-)
src/openvpn/dco_freebsd.c +3 -0
@@ -461,6 +461,9 @@ dco_set_peer(dco_context_t *dco, unsigned int peerid,nvlist_t *nvl;int ret; +msg (D_DCO_DEBUG ,"%s: peer-id %d, ping interval %d, ping timeout %d" , + __func__, peerid, keepalive_interval, keepalive_timeout); + nvl =nvlist_create (0 );nvlist_add_number (nvl,"peerid" , peerid);nvlist_add_number (nvl,"interval" , keepalive_interval);
src/openvpn/init.c +26 -16
60 lines not on this page · raw message
Signature · 1 line
2.37.1 (Apple Git-137.1)
This indeed is good news - as in, the p2p --tls-server test case that used to reliably break when the client disconnected because --ping wasn't working is now working. Tested on Linux/DCO, FreeBSD/DCO and "Linux no DCO", with the full set of client/server tests - it fixes some bits, and breaks nothing else, so good :-)
Stare-at-code and thinking about the flow of control also confirms that this is a good fix - do_up() is executed always (after PUSH_REPLY for --client, and "on init" for --tls-client / --tls-server) so setting up DCO ping/mss is needed there.
(And thanks for adding the logging entry to dco_freebsd.c - I was staring at my logs and wondering why I didn't see anything, even in p2mp mode...)
(... and, as an afterthought, I re-checked to be sure we've not lost multipoint keepalive on the way - we haven't, I can see proper "ping interval..." messages for peer-id 0, 1, 2 in my udp-p2mp instance)
Your patch has been applied to the master and release/2.6 branch.
commit 7c66a6dab54d8efcde57c8fb562f95d95f9b18d4 (master) commit c6ba846384b6a7ab610e5d7de689868fa0a48395 (release/2.6)
Author: Arne Schwabe Date: Mon Dec 19 18:40:27 2022 +0100
Ensure that dco keepalive and mssfix options are also set in pure p2p mode
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/search?l=mid&[email protected]...
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering