X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=6da3c876afffd870f4b76595eddd76a3aa137bc8;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=4aad53f012da36bd16852d945612c4ce6e1fa2f0;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484;p=meshlink

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 4aad53f0..6da3c876 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -1,8 +1,6 @@
 /*
     protocol_edge.c -- handle the meta-protocol, edges
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
-                  2009      Michael Tokarev <mjt@corpit.ru>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -21,7 +19,6 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "edge.h"
@@ -50,7 +47,7 @@ bool send_add_edge(connection_t *c, const edge_t *e) {
 	return x;
 }
 
-bool add_edge_h(connection_t *c, char *request) {
+bool add_edge_h(connection_t *c, const char *request) {
 	edge_t *e;
 	node_t *from, *to;
 	char from_name[MAX_STRING_SIZE];
@@ -63,7 +60,7 @@ bool add_edge_h(connection_t *c, char *request) {
 
 	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d",
 			  from_name, to_name, to_address, to_port, &options, &weight) != 6) {
-		logger(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 false;
 	}
@@ -71,7 +68,7 @@ bool add_edge_h(connection_t *c, char *request) {
 	/* Check if names are valid */
 
 	if(!check_id(from_name) || !check_id(to_name)) {
-		logger(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 false;
 	}
@@ -84,16 +81,6 @@ bool add_edge_h(connection_t *c, char *request) {
 	from = lookup_node(from_name);
 	to = lookup_node(to_name);
 
-	if(tunnelserver &&
-	   from != myself && from != c->node &&
-	   to != myself && to != c->node) {
-		/* ignore indirect edge registrations for tunnelserver */
-		ifdebug(PROTOCOL) logger(LOG_WARNING,
-		   "Ignoring indirect %s from %s (%s)",
-		   "ADD_EDGE", c->name, c->hostname);
-		return true;
-	}
-
 	if(!from) {
 		from = new_node();
 		from->name = xstrdup(from_name);
@@ -118,12 +105,12 @@ bool add_edge_h(connection_t *c, char *request) {
 	if(e) {
 		if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
 			if(from == myself) {
-				ifdebug(PROTOCOL) logger(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 true;
 			} else {
-				ifdebug(PROTOCOL) logger(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();
@@ -131,8 +118,9 @@ bool add_edge_h(connection_t *c, char *request) {
 		} else
 			return true;
 	} else if(from == myself) {
-		ifdebug(PROTOCOL) logger(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);
+		contradicting_add_edge++;
 		e = new_edge();
 		e->from = from;
 		e->to = to;
@@ -151,8 +139,7 @@ bool add_edge_h(connection_t *c, char *request) {
 
 	/* Tell the rest about the new edge */
 
-	if(!tunnelserver)
-		forward_request(c, request);
+	forward_request(c, request);
 
 	/* Run MST before or after we tell the rest? */
 
@@ -166,14 +153,14 @@ bool send_del_edge(connection_t *c, const edge_t *e) {
 						e->from->name, e->to->name);
 }
 
-bool del_edge_h(connection_t *c, char *request) {
+bool del_edge_h(connection_t *c, const char *request) {
 	edge_t *e;
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
 
 	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
-		logger(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 false;
 	}
@@ -181,7 +168,7 @@ bool del_edge_h(connection_t *c, char *request) {
 	/* Check if names are valid */
 
 	if(!check_id(from_name) || !check_id(to_name)) {
-		logger(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 false;
 	}
@@ -194,24 +181,14 @@ bool del_edge_h(connection_t *c, char *request) {
 	from = lookup_node(from_name);
 	to = lookup_node(to_name);
 
-	if(tunnelserver &&
-	   from != myself && from != c->node &&
-	   to != myself && to != c->node) {
-		/* ignore indirect edge registrations for tunnelserver */
-		ifdebug(PROTOCOL) logger(LOG_WARNING,
-		   "Ignoring indirect %s from %s (%s)",
-		   "DEL_EDGE", c->name, c->hostname);
-		return true;
-	}
-
 	if(!from) {
-		ifdebug(PROTOCOL) logger(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 true;
 	}
 
 	if(!to) {
-		ifdebug(PROTOCOL) logger(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 true;
 	}
@@ -221,22 +198,22 @@ bool del_edge_h(connection_t *c, char *request) {
 	e = lookup_edge(from, to);
 
 	if(!e) {
-		ifdebug(PROTOCOL) logger(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 true;
 	}
 
 	if(e->from == myself) {
-		ifdebug(PROTOCOL) logger(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 */
+		contradicting_del_edge++;
+		send_add_edge(c, e);    /* Send back a correction */
 		return true;
 	}
 
 	/* Tell the rest about the deleted edge */
 
-	if(!tunnelserver)
-		forward_request(c, request);
+	forward_request(c, request);
 
 	/* Delete the edge */
 
@@ -251,8 +228,7 @@ bool del_edge_h(connection_t *c, char *request) {
 	if(!to->status.reachable) {
 		e = lookup_edge(to, myself);
 		if(e) {
-			if(!tunnelserver)
-				send_del_edge(broadcast, e);
+			send_del_edge(everyone, e);
 			edge_del(e);
 		}
 	}