X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=92089b1c6a13d93c3ccfcf09fb6bb4a07f6ae69e;hb=06b820133285f83f7e1a839cccbed13358b84081;hp=4760162ccdaae1135e36a973d2b6db06d7c6a494;hpb=04fc19112da5e7fcefefcf6e490987cdcfb6f620;p=tinc

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 4760162c..92089b1c 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -37,19 +37,26 @@
 bool send_add_edge(connection_t *c, const edge_t *e) {
 	bool x;
 	char *address, *port;
-	char *local_address, *local_port;
 
 	sockaddr2str(&e->address, &address, &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);
+	if(e->local_address.sa.sa_family) {
+		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);
+		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);
+	}
 
 	free(address);
 	free(port);
-	free(local_address);
-	free(local_port);
 
 	return x;
 }
@@ -61,9 +68,9 @@ bool add_edge_h(connection_t *c, const char *request) {
 	char to_name[MAX_STRING_SIZE];
 	char to_address[MAX_STRING_SIZE];
 	char to_port[MAX_STRING_SIZE];
-	char address_local[MAX_STRING_SIZE] = "unknown";
-	char port_local[MAX_STRING_SIZE] = "unknown";
-	sockaddr_t address, local_address;
+	char address_local[MAX_STRING_SIZE];
+	char port_local[MAX_STRING_SIZE];
+	sockaddr_t address, local_address = {{0}};
 	uint32_t options;
 	int weight;
 
@@ -117,27 +124,60 @@ bool add_edge_h(connection_t *c, const char *request) {
 	/* Convert addresses */
 
 	address = str2sockaddr(to_address, to_port);
-	local_address = str2sockaddr(address_local, port_local);
+	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) || sockaddrcmp(&e->local_address, &local_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);
-				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
+		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);
@@ -147,18 +187,20 @@ bool add_edge_h(connection_t *c, const char *request) {
 		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)