From patchwork Wed Apr 21 03:43:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1755 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id kE58J2MsgGD1NgAAIUCqbw (envelope-from ) for ; Wed, 21 Apr 2021 09:45:07 -0400 Received: from proxy1.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net with LMTP id sEEjJ2MsgGA5VAAApN4f7A (envelope-from ) for ; Wed, 21 Apr 2021 09:45:07 -0400 Received: from smtp11.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.ord1d.rsapps.net with LMTPS id kMZuJmMsgGAEWAAAasrz9Q (envelope-from ) for ; Wed, 21 Apr 2021 09:45:07 -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: smtp11.gate.ord1d.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: c7f2eeba-a2a7-11eb-9b40-5254005f837b-1-1 Received: from [216.105.38.7] ([216.105.38.7:49092] helo=lists.sourceforge.net) by smtp11.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 6E/6E-07601-26C20806; Wed, 21 Apr 2021 09:45:06 -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 1lZD9Z-0005wc-J5; Wed, 21 Apr 2021 13:44:29 +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 1lZD9C-0005q3-8U for openvpn-devel@lists.sourceforge.net; Wed, 21 Apr 2021 13:44:06 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=GcI2kVyD2OHEAW2uwUSz2wJGbylSBFgYfGD39Qhy0tk=; b=Ga7EkfX7Nzm3/HxyJsO9/ztMeC Di506a/gTVho4YDWc4ga5SveplKcY2TPef/GN4qQDjx0VNqZ3FFdJ/9t8Vg1XZMd/G9T8TM6K+BFo cmUPcCfgVa7JgHHi/v7i9hJI1PUm7Vynnvci+sog6odABIiT+6eUjIb1k5oqNmKb1mgo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=GcI2kVyD2OHEAW2uwUSz2wJGbylSBFgYfGD39Qhy0tk=; b=P EzwARFD6HvThEoTmw8e4eIfhNi5GaEfdthDXX8PqjiPU70jYpp5W3DwxEnFvYZR72ZCWEwk1zvS1a +vssA6+rfN1cUWRBNJsnU8qvP0DYWtCOyb1KeOJ/pz+RH2EO4C/XzO/AEcssm7zUiiUK0tOde23Tf fo3xPw8syg51LOBI=; 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 1lZD90-0004ZH-Mr for openvpn-devel@lists.sourceforge.net; Wed, 21 Apr 2021 13:44:06 +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 1lZD8t-0004QI-SZ for openvpn-devel@lists.sourceforge.net; Wed, 21 Apr 2021 15:43:47 +0200 Received: (nullmailer pid 1950438 invoked by uid 10006); Wed, 21 Apr 2021 13:43:48 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 21 Apr 2021 15:43:42 +0200 Message-Id: <20210421134348.1950392-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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: configure.ac] 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: 1lZD90-0004ZH-Mr Subject: [Openvpn-devel] [PATCH 1/7] 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. Signed-off-by: Arne Schwabe --- configure.ac | 7 ------- src/openvpn/syshead.h | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 747325164..aaac65c3d 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@:>@])], diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index bac07d102..0b029c648 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -391,7 +391,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