upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-13 10:56:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Apply the connect-retry backoff to only one side of a connection

Browse source 
p2p connections with both ends backing off seldom succeed
as their connection attempt durations becomes increasingly
unlikely to overlap when the retry wait time is long.

Avoid this by applying the backoff logic only on TCP clients
or the tls_client side for UDP.

Regression warning: shared secret setups are left out of the
backoff logic.

Trac: #1010, #1384

Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20210602194739.29488-1-selva.nair@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22485.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 063d55afee)
This commit is contained in:
Selva Nair 2021-06-02 15:47:39 -04:00 committed by Gert Doering
parent ad4f8e3761
commit d8dee82f11
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/openvpn/init.c
View file

@ -2455,8 +2455,9 @@ socket_restart_pause(struct context *c)
}
#endif
/* Slow down reconnection after 5 retries per remote -- for tcp only in client mode */
if (c->options.ce.proto != PROTO_TCP_SERVER)
/* Slow down reconnection after 5 retries per remote -- for TCP client or UDP tls-client only */
if (c->options.ce.proto == PROTO_TCP_CLIENT
|| (c->options.ce.proto == PROTO_UDP && c->options.tls_client))
{
backoff = (c->options.unsuccessful_attempts / c->options.connection_list->len) - 4;
if (backoff > 0)