Use bools and enums where appropriate.

[tinc] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index 7d32e21..0d34d8d 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.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,36 +17,18 @@
     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.45 2003/07/06 22:11:32 guus Exp $
+    $Id: netutl.c,v 1.12.4.48 2003/07/22 20:55:20 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.
@@ -67,7 +49,7 @@ struct addrinfo *str2addrinfo(char *address, char *service, int socktype)
        err = getaddrinfo(address, service, &hint, &ai);
 
        if(err) {
-               logger(DEBUG_ALWAYS, LOG_WARNING, _("Error looking up %s port %s: %s\n"), address,
+               logger(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address,
                                   service, gai_strerror(err));
                return NULL;
        }
@@ -92,7 +74,7 @@ sockaddr_t str2sockaddr(char *address, char *port)
        err = getaddrinfo(address, port, &hint, &ai);
 
        if(err || !ai) {
-               logger(DEBUG_ALWAYS, LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port,
+               logger(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port,
                           gai_strerror(err));
                cp_trace();
                raise(SIGFPE);
@@ -117,7 +99,7 @@ void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
        err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
 
        if(err) {
-               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while translating addresses: %s"),
+               logger(LOG_ERR, _("Error while translating addresses: %s"),
                           gai_strerror(err));
                cp_trace();
                raise(SIGFPE);
@@ -145,7 +127,7 @@ char *sockaddr2hostname(sockaddr_t *sa)
        err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
                                        hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
        if(err) {
-               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while looking up hostname: %s"),
+               logger(LOG_ERR, _("Error while looking up hostname: %s"),
                           gai_strerror(err));
        }
 
@@ -186,7 +168,7 @@ int sockaddrcmp(sockaddr_t *a, sockaddr_t *b)
                        return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a->in6.sin6_port));
 
                default:
-                       logger(DEBUG_ALWAYS, LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"),
+                       logger(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"),
                                   a->sa.sa_family);
                        cp_trace();
                        raise(SIGFPE);
@@ -262,7 +244,7 @@ void maskcpy(void *va, void *vb, int masklen, int len)
                a[i] = 0;
 }
 
-int maskcheck(void *va, int masklen, int len)
+bool maskcheck(void *va, int masklen, int len)
 {
        int i;
        char *a = va;
@@ -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;
 }