From patchwork Sat Dec 2 02:45:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 112 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director1.mail.ord1d.rsapps.net ([172.27.255.58]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id g0GvAi+vIlqeDAAAgoeIoA for ; Sat, 02 Dec 2017 08:48:31 -0500 Received: from proxy8.mail.iad3a.rsapps.net ([172.27.255.58]) by director1.mail.ord1d.rsapps.net (Dovecot) with LMTP id b8oXBC6vIlocPQAANGzteQ ; Sat, 02 Dec 2017 08:48:31 -0500 Received: from smtp10.gate.iad3a ([172.27.255.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.iad3a.rsapps.net (Dovecot) with LMTP id xzWmHS6vIlpVFQAAsBr/qg ; Sat, 02 Dec 2017 08:48:30 -0500 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.34.181.88] Authentication-Results: smtp10.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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=unstable.cc X-Classification-ID: 7b05a200-d767-11e7-8db0-bc305bf62ab8-1-1 Received: from [216.34.181.88] ([216.34.181.88:16910] helo=lists.sourceforge.net) by smtp10.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 6F/AE-14831-E2FA22A5; Sat, 02 Dec 2017 08:48:30 -0500 Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1eL887-0005Cu-BF; Sat, 02 Dec 2017 13:46:55 +0000 Received: from sfi-mx-2.v28.ch3.sourceforge.com ([172.29.28.192] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eL886-0005Cj-RO for openvpn-devel@lists.sourceforge.net; Sat, 02 Dec 2017 13:46:54 +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:Cc: To:From:Sender:Reply-To: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=pI3aF3qfsQ8JLbM5XNg3p8ZCKdPz98gwlYnWQXtMTCM=; b=c55nBDzjQA5Kdv3uiM4lVTp5dW e49yPOjIT0kDRsaXPpQOUnJZZLcx8cHww7Eacp1IuGFBgLVqDUEYDKJzuaR49cKvcgXZzDoR6Bo1a g/TDMCoifUL5359RLf8/b2y4Und2Y165o3ycdQwDgR8igDlE0Wqfocep1ERLryeYhtFA=; 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:Cc:To:From:Sender:Reply-To :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=pI3aF3qfsQ8JLbM5XNg3p8ZCKdPz98gwlYnWQXtMTCM=; b=iaysidYeQYGoJPEzG4pyTapKZd szWdYPmWB830v69zOWLrVaLYnCTuF8mPrjP3apNBYcIA48K7q2/6XR5KDs80VOgAdcJps5wsGhDbF 2THNRVFVXOdosdg2MckacArpM+6ivVebKuuSLFd5GcVhPU0dv9jcQHqHRsr7T6E3eaPg=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-2.v28.ch3.sourceforge.com with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) id 1eL886-0003CV-0i for openvpn-devel@lists.sourceforge.net; Sat, 02 Dec 2017 13:46:54 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Sat, 2 Dec 2017 21:45:41 +0800 Message-Id: <20171202134541.7688-7-a@unstable.cc> In-Reply-To: <20171202134541.7688-1-a@unstable.cc> References: <20171202134541.7688-1-a@unstable.cc> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [5.148.176.60 listed in list.dnswl.org] -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1eL886-0003CV-0i Subject: [Openvpn-devel] [PATCH 7/7] Remove TLS_MODE 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: , Cc: Antonio Quartulli MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Now that ENABLE_CRYPTO has been removed, TLS_MODE is basically a useless shortcut which does not really help the readability of the code. Remove it and use its expanded expression instead. Signed-off-by: Antonio Quartulli --- src/openvpn/forward.c | 2 +- src/openvpn/init.c | 2 +- src/openvpn/occ.c | 3 ++- src/openvpn/openvpn.h | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 9bf9483e..85ec71ae 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -948,7 +948,7 @@ process_incoming_link_part2(struct context *c, struct link_socket_info *lsi, con * * Also, update the persisted version of our packet-id. */ - if (!TLS_MODE(c)) + if (!c->c2.tls_multi) { link_socket_set_outgoing_addr(&c->c2.buf, lsi, &c->c2.from, NULL, c->c2.es); } diff --git a/src/openvpn/init.c b/src/openvpn/init.c index f8034ec7..7fe50628 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1306,7 +1306,7 @@ do_init_timers(struct context *c, bool deferred) /* initialize occ timers */ if (c->options.occ - && !TLS_MODE(c) + && !c->c2.tls_multi && c->c2.options_string_local && c->c2.options_string_remote) { event_timeout_init(&c->c2.occ_interval, OCC_INTERVAL_SECONDS, now); diff --git a/src/openvpn/occ.c b/src/openvpn/occ.c index 40f7e768..8434920c 100644 --- a/src/openvpn/occ.c +++ b/src/openvpn/occ.c @@ -378,7 +378,8 @@ process_received_occ_msg(struct context *c) case OCC_REPLY: dmsg(D_PACKET_CONTENT, "RECEIVED OCC_REPLY"); - if (c->options.occ && !TLS_MODE(c) && c->c2.options_string_remote) + if (c->options.occ && !c->c2.tls_multi + && c->c2.options_string_remote) { if (!options_cmp_equal_safe((char *) BPTR(&c->c2.buf), c->c2.options_string_remote, diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h index fe8324ab..b36ca319 100644 --- a/src/openvpn/openvpn.h +++ b/src/openvpn/openvpn.h @@ -556,7 +556,6 @@ struct context * have been compiled in. */ -#define TLS_MODE(c) ((c)->c2.tls_multi != NULL) #define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0) #define PROTO_DUMP(buf, gc) protocol_dump((buf), \ PROTO_DUMP_FLAGS \