From patchwork Fri Oct 23 00:34:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1518 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.27.255.7]) by backend41.mail.ord1d.rsapps.net with LMTP id qBqVOQ3Akl8/fQAAqwncew (envelope-from ) for ; Fri, 23 Oct 2020 07:35:41 -0400 Received: from proxy1.mail.iad3a.rsapps.net ([172.27.255.7]) by director12.mail.ord1d.rsapps.net with LMTP id iFoqOQ3Akl90JAAAIasKDg (envelope-from ) for ; Fri, 23 Oct 2020 07:35:41 -0400 Received: from smtp2.gate.iad3a ([172.27.255.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3a.rsapps.net with LMTPS id UKcmMg3Akl/cQQAA8TVjwQ (envelope-from ) for ; Fri, 23 Oct 2020 07:35:41 -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: smtp2.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: e0fd1bc2-1523-11eb-95b2-525400de56ae-1-1 Received: from [216.105.38.7] ([216.105.38.7:43428] helo=lists.sourceforge.net) by smtp2.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 51/CF-30344-D00C29F5; Fri, 23 Oct 2020 07:35:41 -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 1kVvLQ-000802-VL; Fri, 23 Oct 2020 11:34:52 +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 1kVvLO-0007ze-TV for openvpn-devel@lists.sourceforge.net; Fri, 23 Oct 2020 11:34:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YcTBRoc6HxD0UyaDy2oFINW7CqqROcKysV+3IsrjBYQ=; b=WJFtZvR/dwz38YVW71XfWwdyDy A4RVYmtq87X8dXDkP3bFadhZl5us5lja3hqHJ/BIAJNfoBk8/p3XROI9XSurxeP1IqdwtsRcqTwF3 +bjLUHsVS3xfeobQVOU64m4kYXe6MWe8kO+/rxXHopcNVHlGEBkIUb9Rk7P6brjv1KFg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=YcTBRoc6HxD0UyaDy2oFINW7CqqROcKysV+3IsrjBYQ=; b=JoXi8mOlZGQKuzPeP6AzgqUYT/ izLFIHJqYuyXwC6+lhMRCzg2iOiFzZopzkQkDINW1F0RzhntrxY4qLXyW/Visn/1IsnHWSGeaz0QB CGfh5PavREFc93HS0WWY0pBWy9KuvjRADlAv+7d3PLALEHoR2fNP4TvmvjwC79gqJ2QA=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1kVvLK-003oJU-8K for openvpn-devel@lists.sourceforge.net; Fri, 23 Oct 2020 11:34:50 +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 1kVvL5-000J9u-RS for openvpn-devel@lists.sourceforge.net; Fri, 23 Oct 2020 13:34:31 +0200 Received: (nullmailer pid 26736 invoked by uid 10006); Fri, 23 Oct 2020 11:34:31 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 23 Oct 2020 13:34:27 +0200 Message-Id: <20201023113431.26691-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 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 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1kVvLK-003oJU-8K Subject: [Openvpn-devel] [PATCH 1/5] Inline function tls_get_peer_info 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 All other places in our code also directly access peer_info and this function does not contribute to code clarity. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/multi.c | 2 +- src/openvpn/ssl.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index a5862020..009b46fa 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3993,7 +3993,7 @@ management_get_peer_info(void *arg, const unsigned long cid) if (mi) { - ret = tls_get_peer_info(mi->context.c2.tls_multi); + ret = mi->context.c2.tls_multi->peer_info; } return ret; diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index f00f8abd..f3032dab 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -499,14 +499,6 @@ bool tls_session_update_crypto_params(struct tls_session *session, struct frame *frame, struct frame *frame_fragment); -#ifdef MANAGEMENT_DEF_AUTH -static inline char * -tls_get_peer_info(const struct tls_multi *multi) -{ - return multi->peer_info; -} -#endif - /* * inline functions */