Cleanups:

[oweals/tinc.git] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index a5886fc16ec04f077ed164baa59545574ab7b395..35a3fef6f25cb6f09353adfc83e64dc0fe24caeb 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998-2002 Ivo Timmermans <itimmermans@bigfoot.com>
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
+                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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.42 2002/09/09 19:39:59 guus Exp $
 */
 
 #include "config.h"
@@ -27,6 +27,9 @@
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+#endif
 #include <string.h>
 #include <signal.h>
 #include <sys/socket.h>
@@ -53,13 +56,15 @@ struct addrinfo *str2addrinfo(char *address, char *service, int socktype)
 {
   struct addrinfo hint, *ai;
   int err;
-cp
+  cp();
   memset(&hint, 0, sizeof(hint));
 
   hint.ai_family = addressfamily;
   hint.ai_socktype = socktype;
 
-  if((err = getaddrinfo(address, service, &hint, &ai)))
+  err = getaddrinfo(address, service, &hint, &ai);
+
+  if(err)
     {
       if(debug_lvl >= DEBUG_ERROR)
         syslog(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address, service, gai_strerror(err));
@@ -67,7 +72,7 @@ cp
       return NULL;
     }
 
-cp
+  cp();
   return ai;
 }
 
@@ -76,14 +81,16 @@ sockaddr_t str2sockaddr(char *address, char *port)
   struct addrinfo hint, *ai;
   sockaddr_t result;
   int err;
-cp
+  cp();
   memset(&hint, 0, sizeof(hint));
 
   hint.ai_family = AF_UNSPEC;
   hint.ai_flags = AI_NUMERICHOST;
   hint.ai_socktype = SOCK_STREAM;
 
-  if((err = getaddrinfo(address, port, &hint, &ai) || !ai))
+  err = getaddrinfo(address, port, &hint, &ai);
+
+  if(err || !ai)
     {
       syslog(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port, gai_strerror(err));
       cp_trace();
@@ -93,7 +100,7 @@ cp
 
   result = *(sockaddr_t *)ai->ai_addr;
   freeaddrinfo(ai);
-cp
+  cp();
   return result;
 }
 
@@ -103,8 +110,10 @@ void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
   char port[NI_MAXSERV];
   char *scopeid;
   int err;
-cp
-  if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV)))
+  cp();
+  err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV);
+
+  if(err)
     {
       syslog(LOG_ERR, _("Error while translating addresses: %s"), gai_strerror(err));
       cp_trace();
@@ -112,14 +121,14 @@ cp
       exit(0);
     }
 
-#ifdef HAVE_LINUX
-  if((scopeid = strchr(address, '%')))
+  scopeid = strchr(address, '%');
+
+  if(scopeid)
     *scopeid = '\0';  /* Descope. */
-#endif
 
   *addrstr = xstrdup(address);
   *portstr = xstrdup(port);
-cp
+  cp();
 }
 
 char *sockaddr2hostname(sockaddr_t *sa)
@@ -128,21 +137,22 @@ char *sockaddr2hostname(sockaddr_t *sa)
   char address[NI_MAXHOST] = "unknown";
   char port[NI_MAXSERV] = "unknown";
   int err;
-cp
-  if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), hostnames?0:(NI_NUMERICHOST|NI_NUMERICSERV))))
+  cp();
+  err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), hostnames?0:(NI_NUMERICHOST|NI_NUMERICSERV));
+  if(err)
     {
       syslog(LOG_ERR, _("Error while looking up hostname: %s"), gai_strerror(err));
     }
 
   asprintf(&str, _("%s port %s"), address, port);
-cp
+  cp();
   return str;
 }
 
 int sockaddrcmp(sockaddr_t *a, sockaddr_t *b)
 {
   int result;
-cp
+  cp();
   result = a->sa.sa_family - b->sa.sa_family;
   
   if(result)
@@ -168,49 +178,66 @@ cp
         raise(SIGFPE);
         exit(0);
     }
-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)
+int maskcmp(void *va, void *vb, int masklen, int len)
 {
   int i, m, result;
-cp
+  char *a = va;
+  char *b = vb;
+  cp();
   for(m = masklen, i = 0; m >= 8; m -= 8, i++)
-    if((result = a[i] - b[i]))
-      return result;
-
+    {
+      result = a[i] - b[i];
+      if(result)
+        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;
 }
 
-void mask(char *a, int masklen, int len)
+void mask(void *va, int masklen, int len)
 {
   int i;
-cp
+  char *a = va;
+  cp();
   i = masklen / 8;
   masklen %= 8;
   
   if(masklen)
-    a[i++] &= (0x100 - (masklen << 1));
+    a[i++] &= (0x100 - (1 << masklen));
   
   for(; i < len; i++)
     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;
-cp
+  char *a = va;
+  char *b = vb;
+  cp();
   for(m = masklen, i = 0; m >= 8; m -= 8, i++)
     a[i] = b[i];
 
   if(m)
     {
-      a[i] = b[i] & (0x100 - (m << 1));
+      a[i] = b[i] & (0x100 - (1 << m));
       i++;
     }
 
@@ -218,20 +245,20 @@ cp
     a[i] = 0;
 }
 
-int maskcheck(char *a, int masklen, int len)
+int maskcheck(void *va, int masklen, int len)
 {
   int i;
-cp
+  char *a = va;
+  cp();
   i = masklen / 8;
   masklen %= 8;
-  
-  if(masklen)
-    if(a[i++] & ~(0x100 - (masklen << 1)))
-      return -1;
-  
+
+  if(masklen && a[i++] & (0xff >> masklen))
+    return -1;
+
   for(; i < len; i++)
     if(a[i] != 0)
-      return -1;
+      return -2;
 
   return 0;
 }