From patchwork Mon Aug 10 04:37:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1357 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id wJrCGcxbMV99fQAAIUCqbw for ; Mon, 10 Aug 2020 10:38:04 -0400 Received: from proxy18.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net with LMTP id YAWfGcxbMV+iFgAAalYnBA (envelope-from ) for ; Mon, 10 Aug 2020 10:38:04 -0400 Received: from smtp22.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.ord1d.rsapps.net with LMTP id cJVPGcxbMV/8HAAATCaURg ; Mon, 10 Aug 2020 10:38: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: smtp22.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: 18b9769c-db17-11ea-b7a9-a0369f0d84d2-1-1 Received: from [216.105.38.7] ([216.105.38.7:46290] helo=lists.sourceforge.net) by smtp22.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 92/84-18262-BCB513F5; Mon, 10 Aug 2020 10:38:03 -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.90_1) (envelope-from ) id 1k58vb-0007Fq-3I; Mon, 10 Aug 2020 14:37:31 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k58vV-0007E2-O1 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=yl9MhMLMFYPt0oqfZhrbdH/oRL/A/XQeaKHDAIbZu34=; b=iE9r3ub/KDTmbAY9USc/tScVS7 9sv2VAywVi83lhjGYGhJjS7eISwpCbMsaakGmgGE2m1u8uFBA83544klA68YOMjlCKmUB87afzPx6 a9HCRtA067/47NgpCuFTj4didGdEqNrH1LkrAYvEB19RkRuIFlGHdjo1UlGnsJv4qN/w=; 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=yl9MhMLMFYPt0oqfZhrbdH/oRL/A/XQeaKHDAIbZu34=; b=MbhXx6J1cVdeU2VEf6PSSczGl7 zZglX6IFitV7tMlMqZe1SvFtWdaekVqzsWIpcmSXxcKG/vV1a5IR1q+AQpExk/lPM0C6EY4vRNTHO l3MnsERBLCVyW7Op1PaHpSHpzcrm/4T/Qvw75kY8GgDKxDJR1+DA+Jm/9zPMoahCpyKg=; 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-00FaLB-Me 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-000OSL-Pv for openvpn-devel@lists.sourceforge.net; Mon, 10 Aug 2020 16:37:08 +0200 Received: (nullmailer pid 5913 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:37:01 +0200 Message-Id: <20200810143707.5834-12-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-00FaLB-Me Subject: [Openvpn-devel] [PATCH 11/17] Eliminate check_tls wrapper 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 Move check into caller. Remove two in function forward declarations that are not needed from check_tls_errors. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/forward.c | 27 ++++++--------------------- src/openvpn/forward.h | 2 +- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 0e05b08b..36e5c175 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -77,20 +77,6 @@ show_wait_status(struct context *c) #endif /* ifdef ENABLE_DEBUG */ -/* - * Does TLS session need service? - */ -static inline void -check_tls(struct context *c) -{ - void check_tls_dowork(struct context *c); - - if (c->c2.tls_multi) - { - check_tls_dowork(c); - } -} - /* * TLS errors are fatal in TCP mode. * Also check for --tls-exit trigger. @@ -98,10 +84,6 @@ check_tls(struct context *c) static inline void check_tls_errors(struct context *c) { - void check_tls_errors_co(struct context *c); - - void check_tls_errors_nco(struct context *c); - if (c->c2.tls_multi && c->c2.tls_exit_signal) { if (link_socket_connection_oriented(c->c2.link_socket)) @@ -157,7 +139,7 @@ context_reschedule_sec(struct context *c, int sec) * */ void -check_tls_dowork(struct context *c) +check_tls(struct context *c) { interval_t wakeup = BIG_TIMEOUT; @@ -1852,8 +1834,11 @@ pre_select(struct context *c) return; } - /* Does TLS need service? */ - check_tls(c); + /* If tls is enabled, do tls control channel packet processing. */ + if (c->c2.tls_multi) + { + check_tls(c); + } /* In certain cases, TLS errors will require a restart */ check_tls_errors(c); diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h index 27e7fde7..a8b19f69 100644 --- a/src/openvpn/forward.h +++ b/src/openvpn/forward.h @@ -68,7 +68,7 @@ extern counter_type link_read_bytes_global; extern counter_type link_write_bytes_global; -void check_tls_dowork(struct context *c); +void check_tls(struct context *c); void check_tls_errors_co(struct context *c);