Hi,
On 16-08-17 15:24, Antonio Quartulli wrote:
> 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 <a...@unstable.cc>
> ---
>
> 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(-)
>
> diff --git a/config-msvc.h b/config-msvc.h
> index 9b97e712..0bb153df 100644
> --- a/config-msvc.h
> +++ b/config-msvc.h
> @@ -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
> diff --git a/configure.ac b/configure.ac
> index 8fb204ac..6f1044e8 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -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])
> diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
> index 2973b5ad..d9f5a34d 100644
> --- a/src/openvpn/syshead.h
> +++ b/src/openvpn/syshead.h
> @@ -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
>
Purge With Fire! ACK.
-Steffan
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
