[Openvpn-devel,1/7] Remove --disable-multihome option

Message ID 20210421134348.1950392-1-arne@rfc2549.org
State Changes Requested
Headers show
Series
  • [Openvpn-devel,1/7] Remove --disable-multihome option
Related show

Commit Message

Arne Schwabe April 21, 2021, 1:43 p.m.
With this change we always build multihome support if the operating
system supports it.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 configure.ac          | 7 -------
 src/openvpn/syshead.h | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

Comments

Antonio Quartulli April 21, 2021, 11:59 p.m. | #1
Hi,

On 21/04/2021 15:43, Arne Schwabe wrote:
> With this change we always build multihome support if the operating
> system supports it.
> 
> Signed-off-by: Arne Schwabe <arne@rfc2549.org>

Shouldn't these go too?

$ grep -rn MULTIHOME
config-msvc.h:13:#define ENABLE_MULTIHOME 1
configure.ac:1155:test "${enable_multihome}" = "yes" &&
AC_DEFINE([ENABLE_MULTIHOME], [1], [Enable multi-homed UDP server
capability])

Otherwise it looks good.

Regards,

Patch

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