X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=1e08a9efa5cf3f674933d65bfae44a210ab4b0be;hp=d39640891ccdf1bb812c095350c31fd772e0bbf5;hb=40c2e36a96a3f5c34d4851b30f3561123f3906b5;hpb=813c369a8faca94fc38bc66afafad063fa00f928

diff --git a/src/netutl.c b/src/netutl.c
index d3964089..1e08a9ef 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: netutl.c,v 1.12.4.31 2002/03/18 14:19:02 guus Exp $
+    $Id: netutl.c,v 1.12.4.35 2002/04/19 14:06:40 guus Exp $
 */
 
 #include "config.h"
@@ -27,6 +27,7 @@
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <signal.h>
 #include <sys/socket.h>
@@ -43,10 +44,6 @@
 
 #include "system.h"
 
-#ifndef s6_addr32
-#define s6_addr32 in6_u.u6_addr32
-#endif
-
 int hostnames = 0;
 
 /*
@@ -179,7 +176,7 @@ void sockaddrunmap(sockaddr_t *sa)
 {
   if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr))
     {
-      sa->in.sin_addr.s_addr = sa->in6.sin6_addr.s6_addr32[3];
+      sa->in.sin_addr.s_addr = ((uint32_t *)&sa->in6.sin6_addr)[3];
       sa->in.sin_family = AF_INET;
     }
 }
@@ -195,7 +192,7 @@ cp
       return result;
 
   if(m)
-    return (a[i] & (0x100 - (m << 1))) - (b[i] & (0x100 - (m << 1)));
+    return (a[i] & (0x100 - (1 << (8 - m)))) - (b[i] & (0x100 - (1 << (8 - m))));
 
   return 0;
 }
@@ -208,7 +205,7 @@ cp
   masklen %= 8;
   
   if(masklen)
-    a[i++] &= (0x100 - (masklen << 1));
+    a[i++] &= (0x100 - (1 << masklen));
   
   for(; i < len; i++)
     a[i] = 0;
@@ -223,7 +220,7 @@ cp
 
   if(m)
     {
-      a[i] = b[i] & (0x100 - (m << 1));
+      a[i] = b[i] & (0x100 - (1 << m));
       i++;
     }
 
@@ -239,7 +236,7 @@ cp
   masklen %= 8;
   
   if(masklen)
-    if(a[i++] & ~(0x100 - (masklen << 1)))
+    if(a[i++] & (char)~(0x100 - (1 << masklen)))
       return -1;
   
   for(; i < len; i++)