From patchwork Fri Apr 22 04:29:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2405 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.27.255.51]) by backend41.mail.ord1d.rsapps.net with LMTP id aOLNCpLAYmLhYgAAqwncew (envelope-from ) for ; Fri, 22 Apr 2022 10:49:54 -0400 Received: from proxy17.mail.iad3a.rsapps.net ([172.27.255.51]) by director12.mail.ord1d.rsapps.net with LMTP id wMIOKJLAYmLXNQAAIasKDg (envelope-from ) for ; Fri, 22 Apr 2022 10:49:54 -0400 Received: from smtp14.gate.iad3a ([172.27.255.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy17.mail.iad3a.rsapps.net with LMTPS id MOgFN5PAYmIaZAAAR4KW9A (envelope-from ) for ; Fri, 22 Apr 2022 10:49:55 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp14.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 78109dba-c24b-11ec-9d21-5254005d41e3-1-1 Received: from [216.105.38.7] ([216.105.38.7:57750] helo=lists.sourceforge.net) by smtp14.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 81/58-31851-190C2626; Fri, 22 Apr 2022 10:49:54 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nhuaZ-0007rx-Tj; Fri, 22 Apr 2022 14:48:51 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nhuaZ-0007rm-2F for openvpn-devel@lists.sourceforge.net; Fri, 22 Apr 2022 14:48:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uaam3HdV2eay3F1vUMrclWNFPcKbMJ7SqFNkeWZLZ4A=; b=e8i0eKJCJCNY6rY60FSaMu0vez GnzpX8o40pTXoru6IOy5/prJq9f0meECaOrO+/gTIYxb/03lUwLV+WT0T+AwSQxWhTlHbqe5bem49 5WyrD/c96gfwMRx8rZVuPYSR2LBNClEw+aPs1NDxcKVMfzArvXTxRQUsUU+lBpMuHjJ0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=uaam3HdV2eay3F1vUMrclWNFPcKbMJ7SqFNkeWZLZ4A=; b=Ms/997vU03FBPJpuPPDrfQo5Di F9HUeA3+338mm4xoI5q0fD+mDh0/y7TzKvnMc08E+a7xNedPGUtLbj0SoIKHYH8i+/3JPf1t5f8YZ 8hS8Uskm6PlGk3oo5tR233IYmiUy5yxD1lG+/M/mRy0BwjJqMtIDNdOOJ5yrAXgeH2Xo=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nhuaX-0006ci-8x for openvpn-devel@lists.sourceforge.net; Fri, 22 Apr 2022 14:48:49 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1nhuID-00096K-8B for openvpn-devel@lists.sourceforge.net; Fri, 22 Apr 2022 16:29:53 +0200 Received: (nullmailer pid 3805411 invoked by uid 10006); Fri, 22 Apr 2022 14:29:53 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 22 Apr 2022 16:29:35 +0200 Message-Id: <20220422142953.3805364-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220422134038.3801239-1-arne@rfc2549.org> References: <20220422134038.3801239-1-arne@rfc2549.org> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: We have EXPONENTIAL_BACKOFF as default forever (8c47de7, 2.1.1c, 2010). Remove the other code path that is dead code. --- src/openvpn/reliable.c | 5 ----- src/openvpn/reliable.h | 2 -- 2 files changed [...] Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1nhuaX-0006ci-8x Subject: [Openvpn-devel] [PATCH 10/28] Remove EXPONENTIAL_BACKOFF define X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox 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 --- src/openvpn/reliable.c | 5 ----- src/openvpn/reliable.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/src/openvpn/reliable.c b/src/openvpn/reliable.c index 2aae152bb..d8711f7dc 100644 --- a/src/openvpn/reliable.c +++ b/src/openvpn/reliable.c @@ -602,14 +602,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 cf6de0506..b045410a7 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