Sprinkle around a lot of const and some C99 initialisers.

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

diff --git a/src/netutl.c b/src/netutl.c
index 1f5e4afcaa33ca9713f707b7f8236dddc1ec1559..cd50792feafed8502b4c36ca9ce127419c80e452 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -17,42 +17,24 @@
     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.49 2003/07/24 12:08:15 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;
        int err;
@@ -75,7 +57,7 @@ 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;
        sockaddr_t result;
@@ -105,7 +87,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 +115,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 +136,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 +186,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 +224,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 +244,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 +255,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;
 }