X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=1ec6e5a82199548254b3f3c3813082ef7b47e544;hp=1f5e4afcaa33ca9713f707b7f8236dddc1ec1559;hb=721e4caee0f7c6e003c297c95fb6d93bd4102219;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a

diff --git a/src/netutl.c b/src/netutl.c
index 1f5e4afc..1ec6e5a8 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -17,53 +17,34 @@
     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.46 2003/07/12 17:41:46 guus Exp $
+    $Id: netutl.c,v 1.12.4.50 2003/07/29 22:59:00 guus Exp $
 */
 
-#include "config.h"
-
-#include <fcntl.h>
-#include <netdb.h>
-#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>
-#include <arpa/inet.h>
-
-#include <utils.h>
-#include <xalloc.h>
-
-#include "errno.h"
-#include "conf.h"
+#include "system.h"
+
 #include "net.h"
 #include "netutl.h"
 #include "logger.h"
+#include "utils.h"
+#include "xalloc.h"
 
-#include "system.h"
-
-int hostnames = 0;
+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;
+	struct addrinfo hint = {
+		.ai_family = addressfamily,
+		.ai_socktype = socktype,
+	};
 	int err;
 
 	cp();
 
-	memset(&hint, 0, sizeof(hint));
-
-	hint.ai_family = addressfamily;
-	hint.ai_socktype = socktype;
-
 	err = getaddrinfo(address, service, &hint, &ai);
 
 	if(err) {
@@ -75,20 +56,19 @@ 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;
+	struct addrinfo hint = {
+		.ai_family = AF_UNSPEC,
+		.ai_flags = AI_NUMERICHOST,
+		.ai_socktype = SOCK_STREAM,
+	};
 	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;
-
 	err = getaddrinfo(address, port, &hint, &ai);
 
 	if(err || !ai) {
@@ -105,7 +85,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];
@@ -133,7 +113,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";
@@ -154,7 +134,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;
 
@@ -204,11 +184,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();
 
@@ -242,11 +222,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();
 
@@ -262,10 +242,10 @@ void maskcpy(void *va, void *vb, int masklen, int len)
 		a[i] = 0;
 }
 
-int 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();
 
@@ -273,11 +253,11 @@ int maskcheck(void *va, int masklen, int len)
 	masklen %= 8;
 
 	if(masklen && a[i++] & (0xff >> masklen))
-		return -1;
+		return false;
 
 	for(; i < len; i++)
 		if(a[i] != 0)
-			return -2;
+			return false;
 
-	return 0;
+	return true;
 }