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

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 43e32364..76e6eb48 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -125,7 +125,7 @@ bool add_edge_h(connection_t *c, const char *request) {
 	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(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);
@@ -137,6 +137,28 @@ bool add_edge_h(connection_t *c, const char *request) {
 				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);
+					return true;
+				}
+				// Otherwise, just ignore it.
+				return true;
+			} else if(local_address.sa.sa_family) {
+				// We learned a new local address for this edge.
+				sockaddrfree(&e->local_address);
+				e->local_address = local_address;
+
+				// Tell others about it.
+				if(!tunnelserver)
+					forward_request(c, request);
+
+				return true;
+			}
 		} else
 			return true;
 	} else if(from == myself) {