X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=7a214702b4e072336bf3c04a3295726d1208cc1f;hp=0d34d8d64a73223c27353b93d4a9163b64612227;hb=9bde92ce97d5503ff2d31dcc6f0648902580ec14;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713

diff --git a/src/netutl.c b/src/netutl.c
index 0d34d8d6..7a214702 100644
--- 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.48 2003/07/22 20:55:20 guus Exp $
+    $Id: netutl.c,v 1.12.4.52 2003/08/03 12:38:43 guus Exp $
 */
 
 #include "system.h"
@@ -34,22 +34,20 @@ bool hostnames = false;
   Turn a string into a struct addrinfo.
   Return NULL on failure.
 */
-struct addrinfo *str2addrinfo(char *address, char *service, int socktype)
+struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype)
 {
-	struct addrinfo hint, *ai;
+	struct addrinfo *ai, hint = {0};
 	int err;
 
 	cp();
 
-	memset(&hint, 0, sizeof(hint));
-
 	hint.ai_family = addressfamily;
 	hint.ai_socktype = socktype;
 
 	err = getaddrinfo(address, service, &hint, &ai);
 
 	if(err) {
-		logger(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address,
+		logger(LOG_WARNING, _("Error looking up %s port %s: %s"), address,
 				   service, gai_strerror(err));
 		return NULL;
 	}
@@ -57,16 +55,14 @@ struct addrinfo *str2addrinfo(char *address, char *service, int socktype)
 	return ai;
 }
 
-sockaddr_t str2sockaddr(char *address, char *port)
+sockaddr_t str2sockaddr(const char *address, const char *port)
 {
-	struct addrinfo hint, *ai;
+	struct addrinfo *ai, hint = {0};
 	sockaddr_t result;
 	int err;
 
 	cp();
 
-	memset(&hint, 0, sizeof(hint));
-
 	hint.ai_family = AF_UNSPEC;
 	hint.ai_flags = AI_NUMERICHOST;
 	hint.ai_socktype = SOCK_STREAM;
@@ -74,7 +70,7 @@ sockaddr_t str2sockaddr(char *address, char *port)
 	err = getaddrinfo(address, port, &hint, &ai);
 
 	if(err || !ai) {
-		logger(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port,
+		logger(LOG_ERR, _("Error looking up %s port %s: %s"), address, port,
 			   gai_strerror(err));
 		cp_trace();
 		raise(SIGFPE);
@@ -87,7 +83,7 @@ sockaddr_t str2sockaddr(char *address, char *port)
 	return result;
 }
 
-void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
+void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr)
 {
 	char address[NI_MAXHOST];
 	char port[NI_MAXSERV];
@@ -115,7 +111,7 @@ void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
 	*portstr = xstrdup(port);
 }
 
-char *sockaddr2hostname(sockaddr_t *sa)
+char *sockaddr2hostname(const sockaddr_t *sa)
 {
 	char *str;
 	char address[NI_MAXHOST] = "unknown";
@@ -136,7 +132,7 @@ char *sockaddr2hostname(sockaddr_t *sa)
 	return str;
 }
 
-int sockaddrcmp(sockaddr_t *a, sockaddr_t *b)
+int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
 {
 	int result;
 
@@ -186,11 +182,11 @@ void sockaddrunmap(sockaddr_t *sa)
 
 /* Subnet mask handling */
 
-int maskcmp(void *va, void *vb, int masklen, int len)
+int maskcmp(const void *va, const void *vb, int masklen, int len)
 {
 	int i, m, result;
-	char *a = va;
-	char *b = vb;
+	const char *a = va;
+	const char *b = vb;
 
 	cp();
 
@@ -224,11 +220,11 @@ void mask(void *va, int masklen, int len)
 		a[i] = 0;
 }
 
-void maskcpy(void *va, void *vb, int masklen, int len)
+void maskcpy(void *va, const void *vb, int masklen, int len)
 {
 	int i, m;
 	char *a = va;
-	char *b = vb;
+	const char *b = vb;
 
 	cp();
 
@@ -244,10 +240,10 @@ void maskcpy(void *va, void *vb, int masklen, int len)
 		a[i] = 0;
 }
 
-bool maskcheck(void *va, int masklen, int len)
+bool maskcheck(const void *va, int masklen, int len)
 {
 	int i;
-	char *a = va;
+	const char *a = va;
 
 	cp();