X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=6a7cf78e869ca60ad1db29e3d06e23ddcb423f6e;hp=4ceec9afbaaa440c6609ba0428ee291a0b70e305;hb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/subnet.c b/src/subnet.c
index 4ceec9af..6a7cf78e 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -17,13 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: subnet.c,v 1.1.2.41 2002/09/09 21:25:10 guus Exp $
+    $Id: subnet.c,v 1.1.2.45 2003/07/06 23:16:29 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdio.h>
-#include <syslog.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -39,6 +38,7 @@
 #include "node.h"
 #include "subnet.h"
 #include "netutl.h"
+#include "logger.h"
 
 #include "system.h"
 
@@ -48,7 +48,7 @@ avl_tree_t *subnet_tree;
 
 /* Subnet comparison */
 
-int subnet_compare_mac(subnet_t * a, subnet_t * b)
+static int subnet_compare_mac(subnet_t *a, subnet_t *b)
 {
 	int result;
 
@@ -60,7 +60,7 @@ int subnet_compare_mac(subnet_t * a, subnet_t * b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-int subnet_compare_ipv4(subnet_t * a, subnet_t * b)
+static int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
 {
 	int result;
 
@@ -77,7 +77,7 @@ int subnet_compare_ipv4(subnet_t * a, subnet_t * b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-int subnet_compare_ipv6(subnet_t * a, subnet_t * b)
+static int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
 {
 	int result;
 
@@ -94,7 +94,7 @@ int subnet_compare_ipv6(subnet_t * a, subnet_t * b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-int subnet_compare(subnet_t * a, subnet_t * b)
+static int subnet_compare(subnet_t *a, subnet_t *b)
 {
 	int result;
 
@@ -111,9 +111,7 @@ int subnet_compare(subnet_t * a, subnet_t * b)
 	case SUBNET_IPV6:
 		return subnet_compare_ipv6(a, b);
 	default:
-		syslog(LOG_ERR,
-			   _
-			   ("subnet_compare() was called with unknown subnet type %d, exitting!"),
+		logger(DEBUG_ALWAYS, LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"),
 			   a->type);
 		cp_trace();
 		exit(0);
@@ -145,7 +143,7 @@ avl_tree_t *new_subnet_tree(void)
 	return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
 }
 
-void free_subnet_tree(avl_tree_t * subnet_tree)
+void free_subnet_tree(avl_tree_t *subnet_tree)
 {
 	cp();
 
@@ -161,7 +159,7 @@ subnet_t *new_subnet(void)
 	return (subnet_t *) xmalloc_and_zero(sizeof(subnet_t));
 }
 
-void free_subnet(subnet_t * subnet)
+void free_subnet(subnet_t *subnet)
 {
 	cp();
 
@@ -170,7 +168,7 @@ void free_subnet(subnet_t * subnet)
 
 /* Adding and removing subnets */
 
-void subnet_add(node_t * n, subnet_t * subnet)
+void subnet_add(node_t *n, subnet_t *subnet)
 {
 	cp();
 
@@ -180,7 +178,7 @@ void subnet_add(node_t * n, subnet_t * subnet)
 	avl_insert(n->subnet_tree, subnet);
 }
 
-void subnet_del(node_t * n, subnet_t * subnet)
+void subnet_del(node_t *n, subnet_t *subnet)
 {
 	cp();
 
@@ -259,7 +257,7 @@ subnet_t *str2net(char *subnetstr)
 	return NULL;
 }
 
-char *net2str(subnet_t * subnet)
+char *net2str(subnet_t *subnet)
 {
 	char *netstr;
 
@@ -297,7 +295,7 @@ char *net2str(subnet_t * subnet)
 			break;
 
 		default:
-			syslog(LOG_ERR,
+			logger(DEBUG_ALWAYS, LOG_ERR,
 				   _("net2str() was called with unknown subnet type %d, exiting!"),
 				   subnet->type);
 			cp_trace();
@@ -309,14 +307,14 @@ char *net2str(subnet_t * subnet)
 
 /* Subnet lookup routines */
 
-subnet_t *lookup_subnet(node_t * owner, subnet_t * subnet)
+subnet_t *lookup_subnet(node_t *owner, subnet_t *subnet)
 {
 	cp();
 
 	return avl_search(owner->subnet_tree, subnet);
 }
 
-subnet_t *lookup_subnet_mac(mac_t * address)
+subnet_t *lookup_subnet_mac(mac_t *address)
 {
 	subnet_t subnet, *p;
 
@@ -331,7 +329,7 @@ subnet_t *lookup_subnet_mac(mac_t * address)
 	return p;
 }
 
-subnet_t *lookup_subnet_ipv4(ipv4_t * address)
+subnet_t *lookup_subnet_ipv4(ipv4_t *address)
 {
 	subnet_t subnet, *p;
 
@@ -369,7 +367,7 @@ subnet_t *lookup_subnet_ipv4(ipv4_t * address)
 	return p;
 }
 
-subnet_t *lookup_subnet_ipv6(ipv6_t * address)
+subnet_t *lookup_subnet_ipv6(ipv6_t *address)
 {
 	subnet_t subnet, *p;
 
@@ -413,14 +411,14 @@ void dump_subnets(void)
 
 	cp();
 
-	syslog(LOG_DEBUG, _("Subnet list:"));
+	logger(DEBUG_ALWAYS, LOG_DEBUG, _("Subnet list:"));
 
 	for(node = subnet_tree->head; node; node = node->next) {
 		subnet = (subnet_t *) node->data;
 		netstr = net2str(subnet);
-		syslog(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
+		logger(DEBUG_ALWAYS, LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
 		free(netstr);
 	}
 
-	syslog(LOG_DEBUG, _("End of subnet list."));
+	logger(DEBUG_ALWAYS, LOG_DEBUG, _("End of subnet list."));
 }