X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=dc0cf0512f6afcffc32510522192ea6e33150da7;hp=76e6eb48b32608a8102b7c9ca1261246c015a3cd;hb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;hpb=54a8bd78e3fbe2de4d9daea748643f9c9b5b240e

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 76e6eb48..dc0cf051 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;
 }
@@ -130,12 +137,23 @@ bool add_edge_h(connection_t *c, const char *request) {
 				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();
+				e->options = options;
+				if(sockaddrcmp(&e->address, &address)) {
+					sockaddrfree(&e->address);
+					e->address = 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);
+				}
+
+				goto done;
 			}
 		} else if(sockaddrcmp(&e->local_address, &local_address)) {
 			if(from == myself) {
@@ -144,12 +162,17 @@ bool add_edge_h(connection_t *c, const char *request) {
 					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) {
+			} 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;
 
@@ -158,9 +181,14 @@ bool add_edge_h(connection_t *c, const char *request) {
 					forward_request(c, request);
 
 				return true;
+			} else {
+				sockaddrfree(&local_address);
+				return true;
 			}
-		} else
+		} else {
+			sockaddrfree(&local_address);
 			return true;
+		}
 	} 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);
@@ -170,6 +198,7 @@ bool add_edge_h(connection_t *c, const char *request) {
 		e->to = to;
 		send_del_edge(c, e);
 		free_edge(e);
+		sockaddrfree(&local_address);
 		return true;
 	}
 
@@ -182,6 +211,7 @@ bool add_edge_h(connection_t *c, const char *request) {
 	e->weight = weight;
 	edge_add(e);
 
+done:
 	/* Tell the rest about the new edge */
 
 	if(!tunnelserver)