From patchwork Mon Aug 10 04:36:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1366 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id WIZyLNRbMV99fQAAIUCqbw for ; Mon, 10 Aug 2020 10:38:12 -0400 Received: from proxy1.mail.ord1c.rsapps.net ([172.28.255.1]) by director11.mail.ord1d.rsapps.net with LMTP id QBIJLNRbMV+LTAAAvGGmqA (envelope-from ) for ; Mon, 10 Aug 2020 10:38:12 -0400 Received: from smtp10.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.ord1c.rsapps.net with LMTP id aLC2K9RbMV/ZYQAA2VeTtA ; Mon, 10 Aug 2020 10:38:12 -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: smtp10.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: 1dce955e-db17-11ea-8b0a-0026b954785f-1-1 Received: from [216.105.38.7] ([216.105.38.7:44862] helo=lists.sourceforge.net) by smtp10.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 04/26-32602-4DB513F5; Mon, 10 Aug 2020 10:38:12 -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.90_1) (envelope-from ) id 1k58vi-0004mR-LE; Mon, 10 Aug 2020 14:37:38 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k58vV-0004kO-S4 for openvpn-devel@lists.sourceforge.net; Mon, 10 Aug 2020 14:37:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=PwHHI3NM3n7Y0gZvoQAmCSmmiJPzMt6BieH7nOykhyQ=; b=cft6WUvc3MswVqNqVkpcA1WLXn G/R4M8rEyH6DObq7vtwHhLwfHJ5PA/YyqLE4l7I4gBEMMPYzZEMvIflb2gFnDQnBIP7OqjfYFrWkg KtcN74Jh7/9+AnNf0dwOBIBk7nms1T2O+kSrMOKHzaTzFVH3jV8lhZjTQN9NJtDoqfnM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding: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=PwHHI3NM3n7Y0gZvoQAmCSmmiJPzMt6BieH7nOykhyQ=; b=R6YoQhKvgbAuD5iooKYN6Mj2hQ 6arg0RNPFnAuRB7rXhXlBolyluktwU+1eVigxDsGUdvXYogMtHGtZYaodtkH8pm8Wa8rqNdQ16NBM YIJ9NoOFw18r75TxQh3/i7NWJbOodwETVin/A/gRYjLIOMg4qIbYNNsgH6EUXW+I1wzE=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1k58vU-00FaLA-NU for openvpn-devel@lists.sourceforge.net; Mon, 10 Aug 2020 14:37:25 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1k58vE-000OSF-LW for openvpn-devel@lists.sourceforge.net; Mon, 10 Aug 2020 16:37:08 +0200 Received: (nullmailer pid 5907 invoked by uid 10006); Mon, 10 Aug 2020 14:37:08 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Mon, 10 Aug 2020 16:36:59 +0200 Message-Id: <20200810143707.5834-10-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200810143707.5834-1-arne@rfc2549.org> References: <20200810143707.5834-1-arne@rfc2549.org> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 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 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1k58vU-00FaLA-NU Subject: [Openvpn-devel] [PATCH 09/17] Eliminate check_fragment 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This another of the small wrapper function where the check is better move into the calling function. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/forward.c | 25 +++++-------------------- src/openvpn/forward.h | 2 +- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 27a40b0c..866dd138 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -129,8 +129,6 @@ static inline void check_incoming_control_channel(struct context *c) { #if P2MP - void check_incoming_control_channel_dowork(struct context *c); - if (tls_test_payload_len(c->c2.tls_multi) > 0) { check_incoming_control_channel_dowork(c); @@ -138,22 +136,6 @@ check_incoming_control_channel(struct context *c) #endif } -#ifdef ENABLE_FRAGMENT -/* - * Should we deliver a datagram fragment to remote? - */ -static inline void -check_fragment(struct context *c) -{ - void check_fragment_dowork(struct context *c); - - if (c->c2.fragment) - { - check_fragment_dowork(c); - } -} -#endif - /* * Set our wakeup to 0 seconds, so we will be rescheduled * immediately. @@ -520,7 +502,7 @@ check_status_file(struct context *c) * Should we deliver a datagram fragment to remote? */ void -check_fragment_dowork(struct context *c) +check_fragment(struct context *c) { struct link_socket_info *lsi = get_link_socket_info(c); @@ -1903,7 +1885,10 @@ pre_select(struct context *c) #ifdef ENABLE_FRAGMENT /* Should we deliver a datagram fragment to remote? */ - check_fragment(c); + if (c->c2.fragment) + { + check_fragment(c); + } #endif /* Update random component of timeout */ diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h index 114a24e7..e8b8900a 100644 --- a/src/openvpn/forward.h +++ b/src/openvpn/forward.h @@ -84,7 +84,7 @@ void check_push_request(struct context *c); #endif /* P2MP */ #ifdef ENABLE_FRAGMENT -void check_fragment_dowork(struct context *c); +void check_fragment(struct context *c); #endif /* ENABLE_FRAGMENT */