Cleanup:

[tinc] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index 20d3809..82a4259 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.34 2002/04/05 09:11:38 guus Exp $
+    $Id: netutl.c,v 1.12.4.38 2002/06/08 12:57:10 guus Exp $
 */
 
 #include "config.h"
@@ -27,6 +27,9 @@
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef HAVE_STDINT_H
+ #include <stdint.h>
+#endif
 #include <string.h>
 #include <signal.h>
 #include <sys/socket.h>
@@ -112,10 +115,8 @@ cp
       exit(0);
     }
 
-#ifdef HAVE_LINUX
   if((scopeid = strchr(address, '%')))
     *scopeid = '\0';  /* Descope. */
-#endif
 
   *addrstr = xstrdup(address);
   *portstr = xstrdup(port);
@@ -182,9 +183,11 @@ void sockaddrunmap(sockaddr_t *sa)
 
 /* Subnet mask handling */
 
-int maskcmp(char *a, char *b, int masklen, int len)
+int maskcmp(void *va, void *vb, int masklen, int len)
 {
   int i, m, result;
+  char *a = va;
+  char *b = vb;
 cp
   for(m = masklen, i = 0; m >= 8; m -= 8, i++)
     if((result = a[i] - b[i]))
@@ -196,9 +199,10 @@ cp
   return 0;
 }
 
-void mask(char *a, int masklen, int len)
+void mask(void *va, int masklen, int len)
 {
   int i;
+  char *a = va;
 cp
   i = masklen / 8;
   masklen %= 8;
@@ -210,9 +214,11 @@ cp
     a[i] = 0;
 }
 
-void maskcpy(char *a, char *b, int masklen, int len)
+void maskcpy(void *va, void *vb, int masklen, int len)
 {
   int i, m;
+  char *a = va;
+  char *b = vb;
 cp
   for(m = masklen, i = 0; m >= 8; m -= 8, i++)
     a[i] = b[i];
@@ -227,20 +233,20 @@ cp
     a[i] = 0;
 }
 
-int maskcheck(char *a, int masklen, int len)
+int maskcheck(void *va, int masklen, int len)
 {
   int i;
+  char *a = va;
 cp
   i = masklen / 8;
   masklen %= 8;
-  
-  if(masklen)
-    if(a[i++] & (char)~(0x100 - (1 << masklen)))
-      return -1;
-  
+
+  if(a[i++] & (0xff >> masklen))
+    return -1;
+
   for(; i < len; i++)
     if(a[i] != 0)
-      return -1;
+      return -2;
 
   return 0;
 }