X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=16cf18853e2cdd7f32711d7e7ea3779f700f93df;hb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;hp=81cd52cba410fcfa1540aa7697808c900b2b5467;hpb=f75dcef72a81a337e847adf0bae54198894f65b9;p=tinc

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index 81cd52cb..16cf1885 100644
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -17,14 +17,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_subnet.c,v 1.1.4.8 2002/09/09 21:25:02 guus Exp $
+    $Id: protocol_subnet.c,v 1.1.4.10 2003/07/06 22:11:33 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
@@ -40,10 +39,11 @@
 #include "meta.h"
 #include "connection.h"
 #include "node.h"
+#include "logger.h"
 
 #include "system.h"
 
-int send_add_subnet(connection_t * c, subnet_t * subnet)
+int send_add_subnet(connection_t *c, subnet_t *subnet)
 {
 	int x;
 	char *netstr;
@@ -58,7 +58,7 @@ int send_add_subnet(connection_t * c, subnet_t * subnet)
 	return x;
 }
 
-int add_subnet_h(connection_t * c)
+int add_subnet_h(connection_t *c)
 {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
@@ -114,8 +114,7 @@ int add_subnet_h(connection_t * c)
 	/* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */
 
 	if(owner == myself) {
-		if(debug_lvl >= DEBUG_PROTOCOL)
-			syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
+		logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) for ourself"),
 				   "ADD_SUBNET", c->name, c->hostname);
 		s->owner = myself;
 		send_del_subnet(c, s);
@@ -133,7 +132,7 @@ int add_subnet_h(connection_t * c)
 	return 0;
 }
 
-int send_del_subnet(connection_t * c, subnet_t * s)
+int send_del_subnet(connection_t *c, subnet_t *s)
 {
 	int x;
 	char *netstr;
@@ -149,7 +148,7 @@ int send_del_subnet(connection_t * c, subnet_t * s)
 	return x;
 }
 
-int del_subnet_h(connection_t * c)
+int del_subnet_h(connection_t *c)
 {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
@@ -177,8 +176,7 @@ int del_subnet_h(connection_t * c)
 	owner = lookup_node(name);
 
 	if(!owner) {
-		if(debug_lvl >= DEBUG_PROTOCOL)
-			syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which is not in our node tree"),
+		logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) for %s which is not in our node tree"),
 				   "DEL_SUBNET", c->name, c->hostname, name);
 		return 0;
 	}
@@ -205,8 +203,7 @@ int del_subnet_h(connection_t * c)
 	free_subnet(s);
 
 	if(!find) {
-		if(debug_lvl >= DEBUG_PROTOCOL)
-			syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
+		logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
 				   "DEL_SUBNET", c->name, c->hostname, name);
 		return 0;
 	}
@@ -214,8 +211,7 @@ int del_subnet_h(connection_t * c)
 	/* If we are the owner of this subnet, retaliate with an ADD_SUBNET */
 
 	if(owner == myself) {
-		if(debug_lvl >= DEBUG_PROTOCOL)
-			syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
+		logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) for ourself"),
 				   "DEL_SUBNET", c->name, c->hostname);
 		send_add_subnet(c, find);
 		return 0;