From patchwork Fri Apr 22 03:40:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2384 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id mquDK7+6YmIwOQAAqwncew (envelope-from ) for ; Fri, 22 Apr 2022 10:25:03 -0400 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net with LMTP id kGfEAsC6YmLjdgAAalYnBA (envelope-from ) for ; Fri, 22 Apr 2022 10:25:04 -0400 Received: from smtp17.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net with LMTPS id aHJpAsC6YmJMZAAA8Zzt7w (envelope-from ) for ; Fri, 22 Apr 2022 10:25:04 -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: smtp17.gate.ord1c.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: ff35e24a-c247-11ec-b257-bc305beffb0c-1-1 Received: from [216.105.38.7] ([216.105.38.7:57116] helo=lists.sourceforge.net) by smtp17.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 53/43-23559-EBAB2626; Fri, 22 Apr 2022 10:25:02 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nhuCf-0003rJ-Q1; Fri, 22 Apr 2022 14:24:10 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nhuCe-0003rD-75 for openvpn-devel@lists.sourceforge.net; Fri, 22 Apr 2022 14:24:09 +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=CBAwJ+01ll/8pqcoia42ZLbdM4lliINCXAXa6R68hag=; b=MLYJDadSCXXP72PKTVU2zPsjqK e4MR6mOx72yJ2Xx2NpLSZi8v8zbQAnLz5aynjbVpziwG9KxV5A+o+fLPrtZcf673hz5O5McS3ocR7 Mi5WODN6dBr1HD4uxY/fAUMX05GyRyDYhTDPDcVIcqBvd6M2G3IxtHvvCrzHYXJNXUik=; 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=CBAwJ+01ll/8pqcoia42ZLbdM4lliINCXAXa6R68hag=; b=NlfFFcatQDY7MnvVJuZa6dopr5 LMMUzUSvkY3dQkiO3+BDVS+Y/332U2aHH7xwvpDzx5jQmpMh28sbUP8LbxhPbqJv+uC4gPjbJszp0 P/S//H8S+ini8frWQKq1ZKP9wknXjRQyx1sRXD3HEbaNUTxD6fm9lgJLg1eKRTSa0bIc=; 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 1nhuCc-0005Fp-Qx for openvpn-devel@lists.sourceforge.net; Fri, 22 Apr 2022 14:24:08 +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 1nhtWZ-0008se-28 for openvpn-devel@lists.sourceforge.net; Fri, 22 Apr 2022 15:40:39 +0200 Received: (nullmailer pid 3801312 invoked by uid 10006); Fri, 22 Apr 2022 13:40:38 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 22 Apr 2022 15:40:38 +0200 Message-Id: <20220422134038.3801239-10-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: This is a small cleanup to remove a superfluous argument --- src/openvpn/reliable.c | 7 ++----- src/openvpn/reliable.h | 2 +- src/openvpn/ssl.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) 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: 1nhuCc-0005Fp-Qx Subject: [Openvpn-devel] [PATCH 09/28] Remove inc_pid argument from reliable_mark_deleted that is always true 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 This is a small cleanup to remove a superfluous argument Acked-by: Gert Doering --- src/openvpn/reliable.c | 7 ++----- src/openvpn/reliable.h | 2 +- src/openvpn/ssl.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/openvpn/reliable.c b/src/openvpn/reliable.c index 274f937ab..2aae152bb 100644 --- a/src/openvpn/reliable.c +++ b/src/openvpn/reliable.c @@ -738,7 +738,7 @@ reliable_mark_active_outgoing(struct reliable *rel, struct buffer *buf, int opco /* delete a buffer previously activated by reliable_mark_active() */ void -reliable_mark_deleted(struct reliable *rel, struct buffer *buf, bool inc_pid) +reliable_mark_deleted(struct reliable *rel, struct buffer *buf) { int i; for (i = 0; i < rel->size; ++i) @@ -747,10 +747,7 @@ reliable_mark_deleted(struct reliable *rel, struct buffer *buf, bool inc_pid) if (buf == &e->buf) { e->active = false; - if (inc_pid) - { - rel->packet_id = e->packet_id + 1; - } + rel->packet_id = e->packet_id + 1; return; } } diff --git a/src/openvpn/reliable.h b/src/openvpn/reliable.h index 05426fd8c..cf6de0506 100644 --- a/src/openvpn/reliable.h +++ b/src/openvpn/reliable.h @@ -367,7 +367,7 @@ struct buffer *reliable_get_buf_sequenced(struct reliable *rel); * @param inc_pid If true, the reliable structure's packet ID counter * will be incremented. */ -void reliable_mark_deleted(struct reliable *rel, struct buffer *buf, bool inc_pid); +void reliable_mark_deleted(struct reliable *rel, struct buffer *buf); /** @} name Functions for extracting incoming packets */ diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index cdf3e31da..6669c4719 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -2610,7 +2610,7 @@ tls_process(struct tls_multi *multi, } if (status == 1) { - reliable_mark_deleted(ks->rec_reliable, buf, true); + reliable_mark_deleted(ks->rec_reliable, buf); state_change = true; dmsg(D_TLS_DEBUG, "Incoming Ciphertext -> TLS"); }