From patchwork Tue Apr 26 03:23:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2416 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id +CeMCJTyZ2I+BwAAqwncew (envelope-from ) for ; Tue, 26 Apr 2022 09:24:36 -0400 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.191.6]) by director15.mail.ord1d.rsapps.net with LMTP id WAPrGJTyZ2I1MAAAIcMcQg (envelope-from ) for ; Tue, 26 Apr 2022 09:24:36 -0400 Received: from smtp39.gate.ord1d ([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 4OqeGJTyZ2LiYwAA8Zzt7w (envelope-from ) for ; Tue, 26 Apr 2022 09:24:36 -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: smtp39.gate.ord1d.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: 37082272-c564-11ec-b599-525400a97bbc-1-1 Received: from [216.105.38.7] ([216.105.38.7:49956] helo=lists.sourceforge.net) by smtp39.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 34/D5-11697-392F7626; Tue, 26 Apr 2022 09:24:35 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1njLAK-0001xp-5j; Tue, 26 Apr 2022 13:23:38 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1njLAI-0001xi-NJ for openvpn-devel@lists.sourceforge.net; Tue, 26 Apr 2022 13:23:37 +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=iDJr24AOd9nvMzzU9vXL6Cekd/lWO/Tel/zkZbsaQlc=; b=YUfnZqSNxGG06EBitmxzHaoh26 D90YDsOXP5ordB7RVfnQb/JMuplLeFX3ZeR/N8rWe/KpElEv7CajQxUlv+KQdLJtljvZpwG0vPMO4 vdL/JQzeFusPrP8VD7CI5mWaVmLol/75tM7CNV9ifANA0IcZgZib5rg85VgGkXx/LNeg=; 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=iDJr24AOd9nvMzzU9vXL6Cekd/lWO/Tel/zkZbsaQlc=; b=nTVQxwGqaLpOWYUpie0U9fvJAh ZLEeX2DHS0QwNxggDr2d9aH8QieVLjOoGoj4tYv34HhcTGSHCVQe44CSTI8S/UGMwrSn1Z2jCB0af +hVVHLXprGglrpKDvr4VK/ZO4RaPQkSJcR8dhNkwE829g66tA00eHV9NEkKvI2tnx0w8=; 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 1njLAG-0003IP-2O for openvpn-devel@lists.sourceforge.net; Tue, 26 Apr 2022 13:23:37 +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 1njLA4-0006eu-9N for openvpn-devel@lists.sourceforge.net; Tue, 26 Apr 2022 15:23:24 +0200 Received: (nullmailer pid 76563 invoked by uid 10006); Tue, 26 Apr 2022 13:23:24 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 26 Apr 2022 15:23:23 +0200 Message-Id: <20220426132324.76517-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <0220422134038.3801239-1-arne@rfc2549.org> References: <0220422134038.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 changes this macro to a better named inline function. This introduces a slight whitespace problem but the next refactoring will move the incorrectly intended block to its own function anyway. --- [...] 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: 1njLAG-0003IP-2O Subject: [Openvpn-devel] [PATCH v2] Change FULL_SYNC macro to no_pending_reliable_packets function 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 changes this macro to a better named inline function. This introduces a slight whitespace problem but the next refactoring will move the incorrectly intended block to its own function anyway. Acked-by: Gert Doering --- src/openvpn/ssl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index bad59f2a1..6c6648afa 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -1774,8 +1774,11 @@ flush_payload_buffer(struct key_state *ks) } /* true if no in/out acknowledgements pending */ -#define FULL_SYNC \ - (reliable_empty(ks->send_reliable) && reliable_ack_empty(ks->rec_ack)) +static bool +no_pending_reliable_packets(struct key_state *ks) +{ + return (reliable_empty(ks->send_reliable) && reliable_ack_empty(ks->rec_ack)); +} /* * Move the active key to the lame duck key and reinitialize the @@ -2518,7 +2521,7 @@ tls_process(struct tls_multi *multi, } /* Wait for Initial Handshake ACK */ - if (ks->state == S_PRE_START && FULL_SYNC) + if (ks->state == S_PRE_START && no_pending_reliable_packets(ks)) { ks->state = S_START; state_change = true; @@ -2544,7 +2547,7 @@ tls_process(struct tls_multi *multi, if (((ks->state == S_GOT_KEY && !session->opt->server) || (ks->state == S_SENT_KEY && session->opt->server))) { - if (FULL_SYNC) + if (no_pending_reliable_packets(ks)) { ks->established = now; dmsg(D_TLS_DEBUG_MED, "STATE S_ACTIVE");