From: Arne Schwabe Date: Fri, 22 Apr 2022 14:29:35 +0000 (+0200) Subject: Remove EXPONENTIAL_BACKOFF define X-Git-Tag: v2.6_beta1~234 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b372463931ed706005214c61ffeb75ff313bee22;p=thirdparty%2Fopenvpn.git Remove EXPONENTIAL_BACKOFF define We have EXPONENTIAL_BACKOFF as default forever (8c47de7, 2.1.1c, 2010). Remove the other code path that is dead code. Acked-by: Gert Doering Message-Id: <20220422142953.3805364-1-arne@rfc2549.org> URL: https://www.mail-archive.com/search?l=mid&q=20220422142953.3805364-1-arne@rfc2549.org Signed-off-by: Gert Doering --- diff --git a/src/openvpn/reliable.c b/src/openvpn/reliable.c index b9f01365a..f19257888 100644 --- a/src/openvpn/reliable.c +++ b/src/openvpn/reliable.c @@ -594,14 +594,9 @@ reliable_send(struct reliable *rel, int *opcode) } if (best) { -#ifdef EXPONENTIAL_BACKOFF /* exponential backoff */ best->next_try = local_now + best->timeout; best->timeout *= 2; -#else - /* constant timeout, no backoff */ - best->next_try = local_now + best->timeout; -#endif best->n_acks = 0; *opcode = best->opcode; dmsg(D_REL_DEBUG, "ACK reliable_send ID " packet_id_format " (size=%d to=%d)", diff --git a/src/openvpn/reliable.h b/src/openvpn/reliable.h index 1223b1da2..34bcfd009 100644 --- a/src/openvpn/reliable.h +++ b/src/openvpn/reliable.h @@ -41,8 +41,6 @@ * @{ */ -#define EXPONENTIAL_BACKOFF - #define RELIABLE_ACK_SIZE 8 /**< The maximum number of packet IDs * waiting to be acknowledged which can * be stored in one \c reliable_ack