X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=f97be3ef588d4c84bd987c6c285f313d11d4c891;hb=2a7f11c0e90f5f0465bbc3c75de715454066ff72;hp=6129f71b4b99dd360415079f83f170b680d1ed4c;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8;p=tinc

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 6129f71b..f97be3ef 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.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_edge.c,v 1.1.4.13 2002/09/09 22:33:02 guus Exp $
+    $Id: protocol_edge.c,v 1.1.4.16 2003/07/06 22:11:32 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
@@ -42,6 +41,7 @@
 #include "node.h"
 #include "edge.h"
 #include "graph.h"
+#include "logger.h"
 
 #include "system.h"
 
@@ -79,7 +79,7 @@ int add_edge_h(connection_t *c)
 
 	if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
 			  from_name, to_name, to_address, to_port, &options, &weight) != 6) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name,
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name,
 			   c->hostname);
 		return -1;
 	}
@@ -87,13 +87,13 @@ int add_edge_h(connection_t *c)
 	/* Check if names are valid */
 
 	if(check_id(from_name)) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
 			   c->hostname, _("invalid name"));
 		return -1;
 	}
 
 	if(check_id(to_name)) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
 			   c->hostname, _("invalid name"));
 		return -1;
 	}
@@ -130,22 +130,20 @@ int add_edge_h(connection_t *c)
 	if(e) {
 		if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
 			if(from == myself) {
-				if(debug_lvl >= DEBUG_PROTOCOL)
-					syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"),
+				logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"),
 						   "ADD_EDGE", c->name, c->hostname);
 				send_add_edge(c, e);
 				return 0;
 			} else {
-				if(debug_lvl >= DEBUG_PROTOCOL)
-					syslog(LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"),
+				logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"),
 						   "ADD_EDGE", c->name, c->hostname);
 				edge_del(e);
+				graph();
 			}
 		} else
 			return 0;
 	} else if(from == myself) {
-		if(debug_lvl >= DEBUG_PROTOCOL)
-			syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"),
+		logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"),
 				   "ADD_EDGE", c->name, c->hostname);
 		e = new_edge();
 		e->from = from;
@@ -192,7 +190,7 @@ int del_edge_h(connection_t *c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE", c->name,
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE", c->name,
 			   c->hostname);
 		return -1;
 	}
@@ -200,13 +198,13 @@ int del_edge_h(connection_t *c)
 	/* Check if names are valid */
 
 	if(check_id(from_name)) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
 			   c->hostname, _("invalid name"));
 		return -1;
 	}
 
 	if(check_id(to_name)) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
 			   c->hostname, _("invalid name"));
 		return -1;
 	}
@@ -219,10 +217,7 @@ int del_edge_h(connection_t *c)
 	from = lookup_node(from_name);
 
 	if(!from) {
-		if(debug_lvl >= DEBUG_PROTOCOL)
-			syslog(LOG_ERR,
-				   _
-				   ("Got %s from %s (%s) which does not appear in the edge tree"),
+		logger(DEBUG_PROTOCOL, LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
 				   "DEL_EDGE", c->name, c->hostname);
 		return 0;
 	}
@@ -230,10 +225,7 @@ int del_edge_h(connection_t *c)
 	to = lookup_node(to_name);
 
 	if(!to) {
-		if(debug_lvl >= DEBUG_PROTOCOL)
-			syslog(LOG_ERR,
-				   _
-				   ("Got %s from %s (%s) which does not appear in the edge tree"),
+		logger(DEBUG_PROTOCOL, LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
 				   "DEL_EDGE", c->name, c->hostname);
 		return 0;
 	}
@@ -243,17 +235,13 @@ int del_edge_h(connection_t *c)
 	e = lookup_edge(from, to);
 
 	if(!e) {
-		if(debug_lvl >= DEBUG_PROTOCOL)
-			syslog(LOG_WARNING,
-				   _
-				   ("Got %s from %s (%s) which does not appear in the edge tree"),
+		logger(DEBUG_PROTOCOL, LOG_WARNING, _("Got %s from %s (%s) which does not appear in the edge tree"),
 				   "DEL_EDGE", c->name, c->hostname);
 		return 0;
 	}
 
 	if(e->from == 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_EDGE", c->name, c->hostname);
 		send_add_edge(c, e);	/* Send back a correction */
 		return 0;