X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=dc0cf0512f6afcffc32510522192ea6e33150da7;hp=0879613ce34be1d9cc38c7715a8b5d88950121aa;hb=390d25f0b80dd7418e147de3561c70461628574d;hpb=abb24e9d71b3edb9cacf4c04361cc0dfd4e6a061

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 0879613c..dc0cf051 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -142,8 +142,18 @@ bool add_edge_h(connection_t *c, const char *request) {
 			} 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) {
@@ -158,8 +168,11 @@ bool add_edge_h(connection_t *c, const char *request) {
 				// 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;
 
@@ -168,6 +181,9 @@ bool add_edge_h(connection_t *c, const char *request) {
 					forward_request(c, request);
 
 				return true;
+			} else {
+				sockaddrfree(&local_address);
+				return true;
 			}
 		} else {
 			sockaddrfree(&local_address);
@@ -195,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)