From patchwork Mon May 3 00:56:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1789 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id qKl7KDHXj2AWfwAAIUCqbw (envelope-from ) for ; Mon, 03 May 2021 06:57:53 -0400 Received: from proxy10.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net with LMTP id 8DwjKDHXj2AsHwAAfY0hYg (envelope-from ) for ; Mon, 03 May 2021 06:57:53 -0400 Received: from smtp26.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy10.mail.ord1d.rsapps.net with LMTPS id +DfzJzHXj2BODwAAfSg8FQ (envelope-from ) for ; Mon, 03 May 2021 06:57:53 -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: smtp26.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: 6872c7fc-abfe-11eb-94a8-b8ca3a5bd12c-1-1 Received: from [216.105.38.7] ([216.105.38.7:33086] helo=lists.sourceforge.net) by smtp26.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 9C/03-01309-137DF806; Mon, 03 May 2021 06:57:53 -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 1ldWG3-0006lv-3g; Mon, 03 May 2021 10:56:59 +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 1ldWG0-0006lP-HZ for openvpn-devel@lists.sourceforge.net; Mon, 03 May 2021 10:56:56 +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=c299ezAMjUiV57Ck+bM7RHrsr2jxQsqOfgWhaZYdm2Y=; b=JCM//f4VwamvZz4l0k0mj5esbA yohi+CQ+oW7ugEp6KsezUP+4thg5JH/Jv5RYWUqfEJDNvfmkkAaiwUlk3k8G7iQxVWCp7vbhhiH8a eZ4iLf7VNJ50GhcXi8xumMgDyIcVcNcp+eqxV2bNRC8Jp1KkBkQNRAkR2jf49JyD42yE=; 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=c299ezAMjUiV57Ck+bM7RHrsr2jxQsqOfgWhaZYdm2Y=; b=nUfxF4ncZK/q9levgCQUKX56rR SAor3s8SH93OIogtgOcdh+RzUdL/BP4gWSW9C3QPtL7R9iadHV8UIcu6EZmvo1a1gsp2xmyDB9jX+ ieX1fxOkLd2ptEhitXFCO0cS5bTqQ89cW0r/0BryzwIBzpkqblsMhWkvKEW3seJuJC0M=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1ldWFu-0005DU-Vg for openvpn-devel@lists.sourceforge.net; Mon, 03 May 2021 10:56:56 +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 1ldWFi-000267-HA for openvpn-devel@lists.sourceforge.net; Mon, 03 May 2021 12:56:38 +0200 Received: (nullmailer pid 3903426 invoked by uid 10006); Mon, 03 May 2021 10:56:38 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Mon, 3 May 2021 12:56:38 +0200 Message-Id: <20210503105638.3903379-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210503060713.GS976@greenie.muc.de> References: <20210503060713.GS976@greenie.muc.de> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 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: 1ldWFu-0005DU-Vg Subject: [Openvpn-devel] [PATCH v3] Remove --disable-multihome option 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 With this change we always build multihome support if the operating system supports it. Patch v2: Remove also from config-msvc.h Patch v3: Remove also another line from configure.ac Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- config-msvc.h | 1 - configure.ac | 8 -------- src/openvpn/syshead.h | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config-msvc.h b/config-msvc.h index 360e50a05..979232282 100644 --- a/config-msvc.h +++ b/config-msvc.h @@ -10,7 +10,6 @@ #define ENABLE_LZO 1 #define ENABLE_LZ4 1 #define ENABLE_MANAGEMENT 1 -#define ENABLE_MULTIHOME 1 #define ENABLE_PKCS11 1 #define ENABLE_PLUGIN 1 #define ENABLE_PORT_SHARE 1 diff --git a/configure.ac b/configure.ac index 267ffee8e..f05faf991 100644 --- a/configure.ac +++ b/configure.ac @@ -121,13 +121,6 @@ AC_ARG_ENABLE( [enable_fragment="yes"] ) -AC_ARG_ENABLE( - [multihome], - [AS_HELP_STRING([--disable-multihome], [disable multi-homed UDP server support (--multihome) @<:@default=yes@:>@])], - , - [enable_multihome="yes"] -) - AC_ARG_ENABLE( [port-share], [AS_HELP_STRING([--disable-port-share], [disable TCP server port-share support (--port-share) @<:@default=yes@:>@])], @@ -1150,7 +1143,6 @@ fi test "${ac_cv_header_sys_uio_h}" = "yes" && AC_DEFINE([HAVE_IOVEC], [1], [struct iovec needed for IPv6 support]) test "${enable_management}" = "yes" && AC_DEFINE([ENABLE_MANAGEMENT], [1], [Enable management server capability]) -test "${enable_multihome}" = "yes" && AC_DEFINE([ENABLE_MULTIHOME], [1], [Enable multi-homed UDP server capability]) test "${enable_debug}" = "yes" && AC_DEFINE([ENABLE_DEBUG], [1], [Enable debugging support]) test "${enable_small}" = "yes" && AC_DEFINE([ENABLE_SMALL], [1], [Enable smaller executable size]) test "${enable_fragment}" = "yes" && AC_DEFINE([ENABLE_FRAGMENT], [1], [Enable internal fragmentation support]) diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index 0a3bc0b94..321e20f5b 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -381,7 +381,7 @@ typedef int MIB_TCP_STATE; * Does this platform support linux-style IP_PKTINFO * or bsd-style IP_RECVDSTADDR ? */ -#if defined(ENABLE_MULTIHOME) && ((defined(HAVE_IN_PKTINFO) && defined(IP_PKTINFO)) || defined(IP_RECVDSTADDR)) && defined(HAVE_MSGHDR) && defined(HAVE_CMSGHDR) && defined(HAVE_IOVEC) && defined(CMSG_FIRSTHDR) && defined(CMSG_NXTHDR) && defined(HAVE_RECVMSG) && defined(HAVE_SENDMSG) +#if ((defined(HAVE_IN_PKTINFO) && defined(IP_PKTINFO)) || defined(IP_RECVDSTADDR)) && defined(HAVE_MSGHDR) && defined(HAVE_CMSGHDR) && defined(HAVE_IOVEC) && defined(CMSG_FIRSTHDR) && defined(CMSG_NXTHDR) && defined(HAVE_RECVMSG) && defined(HAVE_SENDMSG) #define ENABLE_IP_PKTINFO 1 #else #define ENABLE_IP_PKTINFO 0