X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=d1a2d022447019af9898772988dd678d6837a165;hb=c6a15e27d934e90a1f3a26438dddb395bdc9de19;hp=c000ec0595ee44e496c1a5bc2cbf1f9b8ad150b5;hpb=3c54765bcdf8bd6114da0cb31f45404950089e3a;p=tinc

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index c000ec05..d1a2d022 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -22,11 +22,11 @@
 #include "system.h"
 
 #include "conf.h"
+#include "crypto.h"
 #include "connection.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
-#include "meta.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
@@ -44,15 +44,15 @@ bool send_add_edge(connection_t *c, const edge_t *e) {
 		char *local_address, *local_port;
 		sockaddr2str(&e->local_address, &local_address, &local_port);
 
-		x = send_request(c, "%d %x %s %s %s %s %x %d %s %s", ADD_EDGE, rand(),
-						 e->from->name, e->to->name, address, port,
-						 e->options, e->weight, local_address, local_port);
+		x = send_request(c, "%d %x %s %s %s %s %x %d %s %s", ADD_EDGE, prng(UINT32_MAX),
+		                 e->from->name, e->to->name, address, port,
+		                 e->options, e->weight, local_address, local_port);
 		free(local_address);
 		free(local_port);
 	} else {
-		x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(),
-						 e->from->name, e->to->name, address, port,
-						 e->options, e->weight);
+		x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, prng(UINT32_MAX),
+		                 e->from->name, e->to->name, address, port,
+		                 e->options, e->weight);
 	}
 
 	free(address);
@@ -70,28 +70,30 @@ bool add_edge_h(connection_t *c, const char *request) {
 	char to_port[MAX_STRING_SIZE];
 	char address_local[MAX_STRING_SIZE];
 	char port_local[MAX_STRING_SIZE];
-	sockaddr_t address, local_address = {{0}};
+	sockaddr_t address, local_address = {0};
 	uint32_t options;
 	int weight;
 
 	int parameter_count = sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d "MAX_STRING" "MAX_STRING,
-			                      from_name, to_name, to_address, to_port, &options, &weight, address_local, port_local);
-	if (parameter_count != 6 && parameter_count != 8) {
+	                             from_name, to_name, to_address, to_port, &options, &weight, address_local, port_local);
+
+	if(parameter_count != 6 && parameter_count != 8) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
-			   c->hostname);
+		       c->hostname);
 		return false;
 	}
 
 	/* Check if names are valid */
 
-	if(!check_id(from_name) || !check_id(to_name)) {
+	if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
-			   c->hostname, "invalid name");
+		       c->hostname, "invalid name");
 		return false;
 	}
 
-	if(seen_request(request))
+	if(seen_request(request)) {
 		return true;
+	}
 
 	/* Lookup nodes */
 
@@ -99,24 +101,22 @@ bool add_edge_h(connection_t *c, const char *request) {
 	to = lookup_node(to_name);
 
 	if(tunnelserver &&
-	   from != myself && from != c->node &&
-	   to != myself && to != c->node) {
+	                from != myself && from != c->node &&
+	                to != myself && to != c->node) {
 		/* ignore indirect edge registrations for tunnelserver */
 		logger(DEBUG_PROTOCOL, LOG_WARNING,
-		   "Ignoring indirect %s from %s (%s)",
-		   "ADD_EDGE", c->name, c->hostname);
+		       "Ignoring indirect %s from %s (%s)",
+		       "ADD_EDGE", c->name, c->hostname);
 		return true;
 	}
 
 	if(!from) {
-		from = new_node();
-		from->name = xstrdup(from_name);
+		from = new_node(from_name);
 		node_add(from);
 	}
 
 	if(!to) {
-		to = new_node();
-		to->name = xstrdup(to_name);
+		to = new_node(to_name);
 		node_add(to);
 	}
 
@@ -124,87 +124,90 @@ bool add_edge_h(connection_t *c, const char *request) {
 	/* Convert addresses */
 
 	address = str2sockaddr(to_address, to_port);
-	if(parameter_count >= 8)
+
+	if(parameter_count >= 8) {
 		local_address = str2sockaddr(address_local, port_local);
+	}
 
 	/* Check if edge already exists */
 
 	e = lookup_edge(from, to);
 
 	if(e) {
-		if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
-			if(from == myself) {
-				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);
-				sockaddrfree(&local_address);
-				return true;
-			} else {
-				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 if(sockaddrcmp(&e->local_address, &local_address)) {
-			if(from == myself) {
-				if(e->local_address.sa.sa_family && local_address.sa.sa_family) {
-					// Someone has the wrong local address for ourself. Correct then.
-					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);
-					sockaddrfree(&local_address);
-					return true;
-				}
-				// Otherwise, just ignore it.
-				sockaddrfree(&local_address);
-				return true;
-			} else if(local_address.sa.sa_family && local_address.sa.sa_family != AF_UNKNOWN) {
-				// We learned a new local address for this edge.
-				// local_address.sa.sa_family will be 0 if we got it from older tinc versions
-				// local_address.sa.sa_family will be 255 (AF_UNKNOWN) if we got it from newer versions
-				// but for edge which does not have local_address
-				sockaddrfree(&e->local_address);
-				e->local_address = local_address;
-
-				// Tell others about it.
-				if(!tunnelserver)
-					forward_request(c, request);
-
-				return true;
-			} else {
-				sockaddrfree(&local_address);
-				return true;
-			}
-		} else {
+		bool new_address = sockaddrcmp(&e->address, &address);
+		// local_address.sa.sa_family will be 0 if we got it from older tinc versions
+		// local_address.sa.sa_family will be 255 (AF_UNKNOWN) if we got it from newer versions
+		// but for edge which does not have local_address
+		bool new_local_address = local_address.sa.sa_family && local_address.sa.sa_family != AF_UNKNOWN &&
+		                         sockaddrcmp(&e->local_address, &local_address);
+
+		if(e->weight == weight && e->options == options && !new_address && !new_local_address) {
+			sockaddrfree(&address);
 			sockaddrfree(&local_address);
 			return true;
 		}
+
+		if(from == myself) {
+			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);
+			sockaddrfree(&address);
+			sockaddrfree(&local_address);
+			return true;
+		}
+
+		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not match existing entry",
+		       "ADD_EDGE", c->name, c->hostname);
+
+		e->options = options;
+
+		if(new_address) {
+			sockaddrfree(&e->address);
+			e->address = address;
+		} else {
+			sockaddrfree(&address);
+		}
+
+		if(new_local_address) {
+			sockaddrfree(&e->local_address);
+			e->local_address = local_address;
+		} else {
+			sockaddrfree(&local_address);
+		}
+
+		if(e->weight != weight) {
+			splay_node_t *node = splay_unlink(&edge_weight_tree, e);
+			e->weight = weight;
+			splay_insert_node(&edge_weight_tree, node);
+		}
 	} else if(from == myself) {
 		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist",
-				   "ADD_EDGE", c->name, c->hostname);
+		       "ADD_EDGE", c->name, c->hostname);
 		contradicting_add_edge++;
 		e = new_edge();
 		e->from = from;
 		e->to = to;
 		send_del_edge(c, e);
 		free_edge(e);
+		sockaddrfree(&address);
 		sockaddrfree(&local_address);
 		return true;
+	} else {
+		e = new_edge();
+		e->from = from;
+		e->to = to;
+		e->address = address;
+		e->local_address = local_address;
+		e->options = options;
+		e->weight = weight;
+		edge_add(e);
 	}
 
-	e = new_edge();
-	e->from = from;
-	e->to = to;
-	e->address = address;
-	e->local_address = local_address;
-	e->options = options;
-	e->weight = weight;
-	edge_add(e);
-
 	/* Tell the rest about the new edge */
 
-	if(!tunnelserver)
+	if(!tunnelserver) {
 		forward_request(c, request);
+	}
 
 	/* Run MST before or after we tell the rest? */
 
@@ -214,8 +217,8 @@ bool add_edge_h(connection_t *c, const char *request) {
 }
 
 bool send_del_edge(connection_t *c, const edge_t *e) {
-	return send_request(c, "%d %x %s %s", DEL_EDGE, rand(),
-						e->from->name, e->to->name);
+	return send_request(c, "%d %x %s %s", DEL_EDGE, prng(UINT32_MAX),
+	                    e->from->name, e->to->name);
 }
 
 bool del_edge_h(connection_t *c, const char *request) {
@@ -226,20 +229,21 @@ bool del_edge_h(connection_t *c, const char *request) {
 
 	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
-			   c->hostname);
+		       c->hostname);
 		return false;
 	}
 
 	/* Check if names are valid */
 
-	if(!check_id(from_name) || !check_id(to_name)) {
+	if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
-			   c->hostname, "invalid name");
+		       c->hostname, "invalid name");
 		return false;
 	}
 
-	if(seen_request(request))
+	if(seen_request(request)) {
 		return true;
+	}
 
 	/* Lookup nodes */
 
@@ -247,24 +251,24 @@ bool del_edge_h(connection_t *c, const char *request) {
 	to = lookup_node(to_name);
 
 	if(tunnelserver &&
-	   from != myself && from != c->node &&
-	   to != myself && to != c->node) {
+	                from != myself && from != c->node &&
+	                to != myself && to != c->node) {
 		/* ignore indirect edge registrations for tunnelserver */
 		logger(DEBUG_PROTOCOL, LOG_WARNING,
-		   "Ignoring indirect %s from %s (%s)",
-		   "DEL_EDGE", c->name, c->hostname);
+		       "Ignoring indirect %s from %s (%s)",
+		       "DEL_EDGE", c->name, c->hostname);
 		return true;
 	}
 
 	if(!from) {
 		logger(DEBUG_PROTOCOL, LOG_ERR, "Got %s from %s (%s) which does not appear in the edge tree",
-				   "DEL_EDGE", c->name, c->hostname);
+		       "DEL_EDGE", c->name, c->hostname);
 		return true;
 	}
 
 	if(!to) {
 		logger(DEBUG_PROTOCOL, LOG_ERR, "Got %s from %s (%s) which does not appear in the edge tree",
-				   "DEL_EDGE", c->name, c->hostname);
+		       "DEL_EDGE", c->name, c->hostname);
 		return true;
 	}
 
@@ -274,13 +278,13 @@ bool del_edge_h(connection_t *c, const char *request) {
 
 	if(!e) {
 		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not appear in the edge tree",
-				   "DEL_EDGE", c->name, c->hostname);
+		       "DEL_EDGE", c->name, c->hostname);
 		return true;
 	}
 
 	if(e->from == myself) {
 		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself",
-				   "DEL_EDGE", c->name, c->hostname);
+		       "DEL_EDGE", c->name, c->hostname);
 		contradicting_del_edge++;
 		send_add_edge(c, e);    /* Send back a correction */
 		return true;
@@ -288,8 +292,9 @@ bool del_edge_h(connection_t *c, const char *request) {
 
 	/* Tell the rest about the deleted edge */
 
-	if(!tunnelserver)
+	if(!tunnelserver) {
 		forward_request(c, request);
+	}
 
 	/* Delete the edge */
 
@@ -303,9 +308,12 @@ bool del_edge_h(connection_t *c, const char *request) {
 
 	if(!to->status.reachable) {
 		e = lookup_edge(to, myself);
+
 		if(e) {
-			if(!tunnelserver)
+			if(!tunnelserver) {
 				send_del_edge(everyone, e);
+			}
+
 			edge_del(e);
 		}
 	}