X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=6386e4cfff0cc5bef7780b9bdebaea636814f116;hp=97186e9654fd378bc3c22c8cc415f866065d2b64;hb=f88c9942e1e3d4d463ec71ba5a60d045381bda8f;hpb=013a2e159e42c46808ea8d0b6abd57525db30a50

diff --git a/src/netutl.c b/src/netutl.c
index 97186e96..6386e4cf 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.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
@@ -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.17 2003/08/24 20:38:25 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -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++;
 	}