OpenVPN

Windows headers do not define the IN6_ARE_ADDR_EQUAL macro. It needs
to be defined locally when building for WIN32 with IPv6 enabled.

Signed-off-by: Heiko Hund <heiko.hund@...>
---
 win32.h |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/win32.h b/win32.h
index d0ecc85..907aaa2 100644
--- a/win32.h
+++ b/win32.h
@@ -41,6 +41,19 @@
  * development environment.
  */
 
+#ifdef USE_PF_INET6
+
+/* MSVC headers do not define this macro, so do it here */
+#ifndef IN6_ARE_ADDR_EQUAL
+#define IN6_ARE_ADDR_EQUAL(a,b) \
+    ((((__const uint32_t *) (a))[0] == ((__const uint32_t *) (b))[0]) \
+  && (((__const uint32_t *) (a))[1] == ((__const uint32_t *) (b))[1]) \
+  && (((__const uint32_t *) (a))[2] == ((__const uint32_t *) (b))[2]) \
+  && (((__const uint32_t *) (a))[3] == ((__const uint32_t *) (b))[3]))
+#endif
+
+#endif
+
 void init_win32 (void);
 void uninit_win32 (void);
 
-- 
1.7.5.4

The s6_addr32 member of struct in6_addr is not available when building
for WIN32. To work around this, a local union is defined that allows
accessing 32 bit chunks of the IPv6 address passed to add_in6_addr().

Signed-off-by: Heiko Hund <heiko.hund@...>
---
 socket.c |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/socket.c b/socket.c
index 6b855c0..887569c 100644
--- a/socket.c
+++ b/socket.c
@@ -2622,13 +2622,6 @@ print_in6_addr (struct in6_addr a6, unsigned int flags, struct gc_arena *gc)
 /* add some offset to an ipv6 address
  * (add in steps of 32 bits, taking overflow into next round)
  */
-#ifndef s6_addr32
-# ifdef TARGET_SOLARIS
-#  define s6_addr32 _S6_un._S6_u32
-# else
-#  define s6_addr32 __u6_addr.__u6_addr32
-# endif
-#endif
 #ifndef UINT32_MAX
 # define UINT32_MAX (4294967295U)
 #endif
@@ -2637,10 +2630,15 @@ struct in6_addr add_in6_addr( struct in6_addr base, uint32_t add )
     int i;
     uint32_t h;
 
+    union {
+      uint8_t  *addr;
+      uint32_t *addr32;
+    } in6 = { .addr = base.s6_addr };
+
     for( i=3; i>=0 && add > 0 ; i-- )
     {
-	h = ntohl( base.s6_addr32[i] );
-	base.s6_addr32[i] = htonl( (h+add) & UINT32_MAX );
+	h = ntohl( in6.addr32[i] );
+	in6.addr32[i] = htonl( (h+add) & UINT32_MAX );
 	/* 32-bit overrun? 
 	 * caveat: can't do "h+add > UINT32_MAX" with 32bit math!
          */
-- 
1.7.5.4

"Heiko Hund" <heiko.hund@...> wrote:

> +#ifndef IN6_ARE_ADDR_EQUAL
> +#define IN6_ARE_ADDR_EQUAL(a,b) \
> +    ((((__const uint32_t *) (a))[0] == ((__const uint32_t *) (b))[0]) \
> +  && (((__const uint32_t *) (a))[1] == ((__const uint32_t *) (b))[1]) \
> +  && (((__const uint32_t *) (a))[2] == ((__const uint32_t *) (b))[2]) \
> +  && (((__const uint32_t *) (a))[3] == ((__const uint32_t *) (b))[3]))
> +#endif

A little more readable:
  #define IN6_ARE_ADDR_EQUAL(a, b)   \
              (!memcmp ((const void*)(a), (const void*)(b), sizeof (struct in6_addr)))

(almost the same as in MingW's <ws2tcpip.h>).

--gv

On Wednesday 10 August 2011 15:47:36 Gisle Vanem wrote:
> "Heiko Hund" <heiko.hund@...> wrote:
> > +#ifndef IN6_ARE_ADDR_EQUAL
> > +#define IN6_ARE_ADDR_EQUAL(a,b) \
> > +    ((((__const uint32_t *) (a))[0] == ((__const uint32_t *) (b))[0]) \
> > +  && (((__const uint32_t *) (a))[1] == ((__const uint32_t *) (b))[1]) \
> > +  && (((__const uint32_t *) (a))[2] == ((__const uint32_t *) (b))[2]) \
> > +  && (((__const uint32_t *) (a))[3] == ((__const uint32_t *) (b))[3]))
> > +#endif
> 
> A little more readable:
>   #define IN6_ARE_ADDR_EQUAL(a, b)   \
>               (!memcmp ((const void*)(a), (const void*)(b), sizeof (struct
> in6_addr)))
> 
> (almost the same as in MingW's <ws2tcpip.h>).

The version I posted is taken from eglibc 2.13 on Debian testing, by the way.

Heiko
-- 
Heiko Hund | Software Engineer | Phone +49-721-25516-237 | Fax -200
Astaro a Sophos Company | Amalienbadstr. 41 Bau 52 | 76227 Karlsruhe | Germany
Commercial Register: Mannheim HRA 702710 | Headquarter Location: Karlsruhe
 
Represented by the General Partner Astaro Verwaltungs GmbH
Amalienbadstraße 41 Bau 52 | 76227 Karlsruhe | Germany 
Commercial Register: Mannheim HRB 708248 | Executive Board: Gert Hansen,
Markus Hennig, Jan Hichert, Günter Junk, Dr. Frank Nellissen

Hi,

On Wed, Aug 10, 2011 at 12:55:06PM +0000, Heiko Hund wrote:
> struct in6_addr.s6_addr32 are not available there.

I've sent a fix for that one to the list some two months ago, but it's
stuck somewhere in the commit queue...

gert
-- 
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             gert@...
fax: +49-89-35655025                        gert@...

Hi,

On Wed, Aug 10, 2011 at 03:47:36PM +0200, Gisle Vanem wrote:
> "Heiko Hund" <heiko.hund@...> wrote:
> 
> > +#ifndef IN6_ARE_ADDR_EQUAL
> > +#define IN6_ARE_ADDR_EQUAL(a,b) \
> > +    ((((__const uint32_t *) (a))[0] == ((__const uint32_t *) (b))[0]) \
> > +  && (((__const uint32_t *) (a))[1] == ((__const uint32_t *) (b))[1]) \
> > +  && (((__const uint32_t *) (a))[2] == ((__const uint32_t *) (b))[2]) \
> > +  && (((__const uint32_t *) (a))[3] == ((__const uint32_t *) (b))[3]))
> > +#endif
> 
> A little more readable:
>   #define IN6_ARE_ADDR_EQUAL(a, b)   \
>               (!memcmp ((const void*)(a), (const void*)(b), sizeof (struct in6_addr)))

... and guaranteed to be safe regarding alignment... so I like the second
one better.

gert
-- 
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             gert@...
fax: +49-89-35655025                        gert@...

Hello,
I think this should be done by autoconf.
And hand added into win32 for MSVC.
Alon.

On Wed, Aug 10, 2011 at 3:55 PM, Heiko Hund <heiko.hund@...> wrote:
> The s6_addr32 member of struct in6_addr is not available when building
> for WIN32. To work around this, a local union is defined that allows
> accessing 32 bit chunks of the IPv6 address passed to add_in6_addr().
>
> Signed-off-by: Heiko Hund <heiko.hund@...>
> ---
>  socket.c |   16 +++++++---------
>  1 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/socket.c b/socket.c
> index 6b855c0..887569c 100644
> --- a/socket.c
> +++ b/socket.c
> @@ -2622,13 +2622,6 @@ print_in6_addr (struct in6_addr a6, unsigned int flags, struct gc_arena *gc)
>  /* add some offset to an ipv6 address
>  * (add in steps of 32 bits, taking overflow into next round)
>  */
> -#ifndef s6_addr32
> -# ifdef TARGET_SOLARIS
> -#  define s6_addr32 _S6_un._S6_u32
> -# else
> -#  define s6_addr32 __u6_addr.__u6_addr32
> -# endif
> -#endif
>  #ifndef UINT32_MAX
>  # define UINT32_MAX (4294967295U)
>  #endif
> @@ -2637,10 +2630,15 @@ struct in6_addr add_in6_addr( struct in6_addr base, uint32_t add )
>     int i;
>     uint32_t h;
>
> +    union {
> +      uint8_t  *addr;
> +      uint32_t *addr32;
> +    } in6 = { .addr = base.s6_addr };
> +
>     for( i=3; i>=0 && add > 0 ; i-- )
>     {
> -       h = ntohl( base.s6_addr32[i] );
> -       base.s6_addr32[i] = htonl( (h+add) & UINT32_MAX );
> +       h = ntohl( in6.addr32[i] );
> +       in6.addr32[i] = htonl( (h+add) & UINT32_MAX );
>        /* 32-bit overrun?
>         * caveat: can't do "h+add > UINT32_MAX" with 32bit math!
>          */
> --
> 1.7.5.4
>
>
> ------------------------------------------------------------------------------
> uberSVN's rich system and user administration capabilities and model
> configuration take the hassle out of deploying and managing Subversion and
> the tools developers use with it. Learn more about uberSVN and get a free
> download at:  http://p.sf.net/sfu/wandisco-dev2dev
> _______________________________________________
> Openvpn-devel mailing list
> Openvpn-devel@...
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>