Update copyright information.

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

diff --git a/src/netutl.c b/src/netutl.c
index 83dbe2bd1dd2dfa5fb16ed4053d9389d956c102b..757bc5d8052596b31584a2793363698e4db7fe97 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>
-                  2000-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.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
@@ -78,7 +78,7 @@ sockaddr_t str2sockaddr(const char *address, const char *port)
                return result;
        }
 
-       result = *(sockaddr_t *) ai->ai_addr;
+       memcpy(&result, ai->ai_addr, ai->ai_addrlen);
        freeaddrinfo(ai);
 
        return result;
@@ -128,7 +128,7 @@ char *sockaddr2hostname(const sockaddr_t *sa)
        cp();
 
        if(sa->sa.sa_family == AF_UNKNOWN) {
-               asprintf(&str, _("%s port %s"), sa->unknown.address, sa->unknown.port);
+               xasprintf(&str, _("%s port %s"), sa->unknown.address, sa->unknown.port);
                return str;
        }
 
@@ -139,11 +139,44 @@ char *sockaddr2hostname(const sockaddr_t *sa)
                           gai_strerror(err));
        }
 
-       asprintf(&str, _("%s port %s"), address, port);
+       xasprintf(&str, _("%s port %s"), address, port);
 
        return str;
 }
 
+int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b)
+{
+       int result;
+
+       cp();
+
+       result = a->sa.sa_family - b->sa.sa_family;
+
+       if(result)
+               return result;
+
+       switch (a->sa.sa_family) {
+               case AF_UNSPEC:
+                       return 0;
+
+               case AF_UNKNOWN:
+                       return strcmp(a->unknown.address, b->unknown.address);
+
+               case AF_INET:
+                       return memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
+
+               case AF_INET6:
+                       return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
+
+               default:
+                       logger(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"),
+                                  a->sa.sa_family);
+                       cp_trace();
+                       raise(SIGFPE);
+                       exit(0);
+       }
+}
+
 int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
 {
        int result;
@@ -225,7 +258,7 @@ void sockaddrunmap(sockaddr_t *sa)
 
 /* Subnet mask handling */
 
-int maskcmp(const void *va, const void *vb, int masklen, int len)
+int maskcmp(const void *va, const void *vb, int masklen)
 {
        int i, m, result;
        const char *a = va;
@@ -257,7 +290,7 @@ void mask(void *va, int masklen, int len)
        masklen %= 8;
 
        if(masklen)
-               a[i++] &= (0x100 - (1 << masklen));
+               a[i++] &= (0x100 - (1 << (8 - masklen)));
 
        for(; i < len; i++)
                a[i] = 0;
@@ -275,7 +308,7 @@ void maskcpy(void *va, const void *vb, int masklen, int len)
                a[i] = b[i];
 
        if(m) {
-               a[i] = b[i] & (0x100 - (1 << m));
+               a[i] = b[i] & (0x100 - (1 << (8 - m)));
                i++;
        }