Am 17.11.14 21:58, schrieb Gert Doering:
> Add missing #define for IPV6_V6ONLY sockopt.
>
> Fix last remaining fallout of dual-stack patch set in connect() call
> for "not CONNECT_NONBLOCK" case.
I like your optimism.

> Signed-off-by: Gert Doering <g...@greenie.muc.de>
> ---
>  src/openvpn/socket.c |   10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
> index 2499ab0..f3f6422 100644
> --- a/src/openvpn/socket.c
> +++ b/src/openvpn/socket.c
> @@ -1081,6 +1081,14 @@ socket_listen_accept (socket_descriptor_t sd,
>    return new_sd;
>  }
>  
> +/* older mingw versions and WinXP do not have this define, 
> + * but Vista and up support the functionality - just define it here
> + */
> +#ifdef WIN32
> +# ifndef IPV6_V6ONLY
> +#  define IPV6_V6ONLY 27
> +# endif
> +#endif
>  void
>  socket_bind (socket_descriptor_t sd,
>               struct addrinfo *local,
> @@ -1211,7 +1219,7 @@ openvpn_connect (socket_descriptor_t sd,
>       }
>      }
>  #else
> -  status = connect (sd, &remote->addr.sa, 
> af_addr_size(remote->addr.sa.sa_family));
> +  status = connect (sd, remote, af_addr_size(remote->sa_family));
>    if (status)
>      status = openvpn_errno ();
>  #endif

ACK

Arne

Reply via email to