remove the --disable-multi config switch

PATCH Superseded Antonio Quartulli 3 participants 4 messages Aug 16, 2017

Share & tools

Antonio Quartulli

author

2017-08-16 13:11 UTC #0 lore raw

PATCH 1/1 remove the --disable-multi config switch

This switch is broken and unmaintained.
However there wasn't any ticket about it so far,
which means that it is practically unused.

Get rid of it and simplify the P2MP logic.

Signed-off-by Antonio Quartulli <[email protected]...>

---
 configure.ac          | 8 --------
 src/openvpn/syshead.h | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

configure.ac +0 -8

index 8fb204ac..6f1044e8 100644
@@ -98,13 +98,6 @@ AC_ARG_ENABLE(
 	[enable_x509_alt_username="no"]
 )
 
-AC_ARG_ENABLE(
-	[multi],
-	[AS_HELP_STRING([--disable-multi], [disable client/server support (--mode server + client mode) @<:@default=yes@:>@])],
-	,
-	[enable_multi="yes"]
-)
-
 AC_ARG_ENABLE(
 	[server],
 	[AS_HELP_STRING([--disable-server], [disable server support only (but retain client support) @<:@default=yes@:>@])],

@@ -1197,7 +1190,6 @@ if test "${enable_x509_alt_username}" = "yes"; then
 fi
 
 test "${ac_cv_header_sys_uio_h}" = "yes" && AC_DEFINE([HAVE_IOVEC], [1], [struct iovec needed for IPv6 support])
-test "${enable_multi}" = "yes" && AC_DEFINE([ENABLE_CLIENT_SERVER], [1], [Enable client/server capability])
 test "${enable_server}" = "no" && AC_DEFINE([ENABLE_CLIENT_ONLY], [1], [Enable client capability only])
 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])

src/openvpn/syshead.h +1 -1

index 2973b5ad..d9f5a34d 100644
@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd)
  * Do we have point-to-multipoint capability?
  */
 
-#if defined(ENABLE_CLIENT_SERVER) && defined(ENABLE_CRYPTO) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS)
+#if defined(ENABLE_CRYPTO) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS)
 #define P2MP 1
 #else
 #define P2MP 0

Signature · 1 line

2.14.0

Antonio Quartulli

author

2017-08-16 13:24 UTC #1 lore raw

PATCH v2 1/1 remove the --disable-multi config switch

This switch is broken and unmaintained.
However there wasn't any ticket about it so far,
which means that it is practically unused.

Get rid of it and simplify P2MP logic.

Signed-off-by Antonio Quartulli <[email protected]...>

---

v2: remove ENABLE_CLIENT_SERVEr define from config-msvc.h

 config-msvc.h         | 1 -
 configure.ac          | 8 --------
 src/openvpn/syshead.h | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

config-msvc.h +0 -1

index 9b97e712..0bb153df 100644
@@ -4,7 +4,6 @@
 
 #define ENABLE_DEF_AUTH 1
 #define ENABLE_PF 1
-#define ENABLE_CLIENT_SERVER 1
 #define ENABLE_CRYPTO 1
 #define ENABLE_CRYPTO_OPENSSL 1
 #define ENABLE_DEBUG 1

configure.ac +0 -8

index 8fb204ac..6f1044e8 100644
@@ -98,13 +98,6 @@ AC_ARG_ENABLE(
 	[enable_x509_alt_username="no"]
 )
 
-AC_ARG_ENABLE(
-	[multi],
-	[AS_HELP_STRING([--disable-multi], [disable client/server support (--mode server + client mode) @<:@default=yes@:>@])],
-	,
-	[enable_multi="yes"]
-)
-
 AC_ARG_ENABLE(
 	[server],
 	[AS_HELP_STRING([--disable-server], [disable server support only (but retain client support) @<:@default=yes@:>@])],

@@ -1197,7 +1190,6 @@ if test "${enable_x509_alt_username}" = "yes"; then
 fi
 
 test "${ac_cv_header_sys_uio_h}" = "yes" && AC_DEFINE([HAVE_IOVEC], [1], [struct iovec needed for IPv6 support])
-test "${enable_multi}" = "yes" && AC_DEFINE([ENABLE_CLIENT_SERVER], [1], [Enable client/server capability])
 test "${enable_server}" = "no" && AC_DEFINE([ENABLE_CLIENT_ONLY], [1], [Enable client capability only])
 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])

src/openvpn/syshead.h +1 -1

index 2973b5ad..d9f5a34d 100644
@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd)
  * Do we have point-to-multipoint capability?
  */
 
-#if defined(ENABLE_CLIENT_SERVER) && defined(ENABLE_CRYPTO) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS)
+#if defined(ENABLE_CRYPTO) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS)
 #define P2MP 1
 #else
 #define P2MP 0

Signature · 1 line

2.14.0

David Sommerseth

2017-08-16 15:09 UTC #3 lore raw

In reply to Antonio Quartulli

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Your patch has been applied to the following branches

commit 299a8f8f1aa10b5b0d006ae77c26de33d55d4a25 (master) commit 12df7c26a5210052029acbf47bdf9aee673b34ee (release/2.4)

Author: Antonio Quartulli
Date:   Wed Aug 16 21:24:54 2017 +0800

     remove the --disable-multi config switch

     Signed-off-by: Antonio Quartulli <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg15275.html
     Signed-off-by: David Sommerseth <[email protected]...>

- --
kind regards,

David Sommerseth

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCgAGBQJZlGAmAAoJEIbPlEyWcf3yHFMP/jU0S1g9wVZFNtvQQ2wL/ZxZ wFSP+jPrHVwOm3fKz8VVGVRdrjtaO1Cwja5xADJWt5KHVh5Bci8C+Yk0sEXoItYz uy9ko1JlRNIMQzjtrh8sLGCAYqlSUsR5GuqNpWqWLB92HdVIi882GNIBC3l0Uo0m XqH4/2agCxaTPO5nZk3+VtEhEkJoCFxcROjPiLgPUoHNUn4rg1MPc6EhhyBVzzeH QjccUEdYLA0Lar9fv2B/Nzke6CzXVzrCq/eyOXyP0PplxqSqAlnnDg9PKPrS9psl WT/lBlKOfb6AnwK870IRo+BoQVwNbI1d6mLbZNKoojdtRKDmqRvcx6vwFxirjklO WpGJoTEGtcjswXAHuGwCfPclsSQUtoKSkFjI863XtJsTvTXONrIzqW391Fmxb1x+ mWL08opLcBvTmOgT89G12wxzjaq5vV9jb6hPjNd2c//IeD1fXqFyPyNnFA9K+pYE PtywIuUt07kBOb7dBVkE/QFcYUNZBeGiuysSQPY4NOU0tY174MDpAIz0+1RfXlvW llQk3RPyp+TD5Z1NOZMgx5PrYlfpSKu9qDyeJAUxsT1w1iKV8gaySHeTd+c0RJol d8wuEwlnLqgs3N5T9LnPGb3HWGw82RNRhcq4+lr2+qGOfWGESYg1vz5rR3v8UueA VNY7h3NZ3rz/gIarz4Cy
=HsyD
-----END PGP SIGNATURE-----