Fix maskcheck() and maskcmp().

[tinc] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index a5886fc..20d3809 100644 (file)
--- 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.28 2002/02/26 22:47:51 guus Exp $
+    $Id: netutl.c,v 1.12.4.34 2002/04/05 09:11:38 guus Exp $
 */
 
 #include "config.h"
@@ -171,6 +171,15 @@ cp
 cp
 }
 
+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 = ((uint32_t *)&sa->in6.sin6_addr)[3];
+      sa->in.sin_family = AF_INET;
+    }
+}
+
 /* Subnet mask handling */
 
 int maskcmp(char *a, char *b, int masklen, int len)
@@ -182,7 +191,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;
 }
@@ -195,7 +204,7 @@ cp
   masklen %= 8;
   
   if(masklen)
-    a[i++] &= (0x100 - (masklen << 1));
+    a[i++] &= (0x100 - (1 << masklen));
   
   for(; i < len; i++)
     a[i] = 0;
@@ -210,7 +219,7 @@ cp
 
   if(m)
     {
-      a[i] = b[i] & (0x100 - (m << 1));
+      a[i] = b[i] & (0x100 - (1 << m));
       i++;
     }
 
@@ -226,7 +235,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++)