X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=4d91bf4460cb1e40662e0c47c915cf4f804b27ed;hp=3b5d5b05d7eb8ed2cc11109da1bd995ade9d656b;hb=d333fca4d611b85dd922ddf35bd9eddcb8095c85;hpb=106fc2b769a635142bf5f9233a2f03e3a0f26b7f

diff --git a/src/netutl.c b/src/netutl.c
index 3b5d5b05..4d91bf44 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.32 2002/03/18 14:39:37 guus Exp $
+    $Id: netutl.c,v 1.12.4.37 2002/06/07 11:14:05 wsl Exp $
 */
 
 #include "config.h"
@@ -27,6 +27,9 @@
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef HAVE_NETBSD
+ #include <stdint.h>
+#endif
 #include <string.h>
 #include <signal.h>
 #include <sys/socket.h>
@@ -43,10 +46,6 @@
 
 #include "system.h"
 
-#ifndef s6_addr32
-#define s6_addr32 __u6_addr.__u6_addr32
-#endif
-
 int hostnames = 0;
 
 /*
@@ -179,7 +178,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 +194,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 +207,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 +222,7 @@ cp
 
   if(m)
     {
-      a[i] = b[i] & (0x100 - (m << 1));
+      a[i] = b[i] & (0x100 - (1 << m));
       i++;
     }
 
@@ -237,14 +236,13 @@ int maskcheck(char *a, int masklen, int len)
 cp
   i = masklen / 8;
   masklen %= 8;
-  
-  if(masklen)
-    if(a[i++] & ~(0x100 - (masklen << 1)))
-      return -1;
-  
+
+  if(a[i++] & (0xff >> masklen))
+    return -1;
+
   for(; i < len; i++)
     if(a[i] != 0)
-      return -1;
+      return -2;
 
   return 0;
 }