Hi, On Thu, May 26, 2011 at 04:23:02PM +0300, Samuli Seppänen wrote: > Partially fixes ticket #137 > > Signed-off-by: Gert Doering <g...@greenie.muc.de> > Signed-off-by: Samuli Seppänen <sam...@openvpn.net> > Tested-by: Samuli Seppänen <sam...@openvpn.net>
NAK, something went wrong here.
> --- a/helper.c
> +++ b/helper.c
> @@ -143,6 +143,12 @@ helper_client_server (struct options *o)
> #if P2MP
> #if P2MP_SERVER
>
> +/*
> + * Get tun/tap/null device type
> + */
> + const int dev = dev_type_enum (o->dev, o->dev_type);
> + const int topology = o->topology;
> +
> /*
> *
> * HELPER DIRECTIVE for IPv6
> @@ -220,12 +226,6 @@ helper_client_server (struct options *o)
> * push "route-gateway 10.8.0.1"
> */
>
> - /*
> - * Get tun/tap/null device type
> - */
> - const int dev = dev_type_enum (o->dev, o->dev_type);
> - const int topology = o->topology;
> -
> if (o->server_defined)
> {
> int netbits = -2;
This is OK.
> diff --git a/socket.c b/socket.c
> index 6b855c0..3d4801f 100644
> --- a/socket.c
> +++ b/socket.c
> @@ -3156,6 +3156,8 @@ link_socket_write_udp_posix_sendmsg (struct link_socket
> *sock,
> * inet_ntop() and inet_pton() wrap-implementations using
> * WSAAddressToString() and WSAStringToAddress() functions
> */
> +
> +/*
> const char *
> inet_ntop(int af, const void *src, char *dst, socklen_t size)
> {
> @@ -3204,6 +3206,8 @@ inet_pton(int af, const char *src, void *dst)
> return 0;
> }
>
> +*/
> +
> int
> socket_recv_queue (struct link_socket *sock, int maxsize)
> {
This is not. Our local implementations of inet_ntop and inet_pton
are needed for msys/mingw and conflict with MS VS, so they need to
be there, but conditional on _MSC_VER. So this should be:
#ifndef _MSC_VER
...
#endif
> diff --git a/win/config.h.in b/win/config.h.in
> index 82344a0..ec447a2 100644
> --- a/win/config.h.in
> +++ b/win/config.h.in
> @@ -275,7 +275,7 @@ typedef unsigned long in_addr_t;
> #define inline __inline
>
> /* type to use in place of socklen_t if not defined */
> -#define socklen_t unsigned int
> +/*#define socklen_t unsigned int*/
>
> #ifndef __MINGW32__
> /* 32-bit unsigned type */
This needs to be tested whether it still works with mingw/msys - I have
my doubts. So this change also needs to be conditional
#ifndef _MSC_VER
#define socklen_t unsigned int
#endif
(or vice versa, "#ifdef __MINGW32__").
> diff --git a/win32.h b/win32.h
> index d0ecc85..3b26bb1 100644
> --- a/win32.h
> +++ b/win32.h
> @@ -272,8 +272,10 @@ char *get_win_sys_path (void);
>
> /* call self in a subprocess */
> void fork_to_self (const char *cmdline);
> +#ifdef _MSV_VER
> const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
> int inet_pton(int af, const char *src, void *st);
> +#endif
NAK, this needs to be "#ifndef _MSC_VER"
gert
--
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
pgpF7FbuxG_yV.pgp
Description: PGP signature
