Use memcpy() to copy sockaddrs returned by getaddrinfo().

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

diff --git a/src/netutl.c b/src/netutl.c
index 83dbe2bd1dd2dfa5fb16ed4053d9389d956c102b..6386e4cfff0cc5bef7780b9bdebaea636814f116 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-2006 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;
@@ -257,7 +257,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 +275,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++;
        }