X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=22692bb614e97632d2224bedbd77b1fb28647976;hp=341d0ac9f86b03a11b10815d7e7b8c22fb5e2851;hb=4b6a9f1c1f645ce5989692655337d9e23ca28648;hpb=40d91ff619a6ea24a2a35c9d934bcc6bace27e24

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 341d0ac9..22692bb6 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -36,15 +36,19 @@
 
 bool mykeyused = false;
 
-bool send_key_changed() {
-	/* Only send this message if some other daemon requested our key previously.
-	   This reduces unnecessary key_changed broadcasts.
-	 */
+void send_key_changed() {
+	avl_node_t *node;
+	connection_t *c;
 
-	if(!mykeyused)
-		return true;
+	send_request(broadcast, "%d %x %s", KEY_CHANGED, rand(), myself->name);
+
+	/* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
 
-	return send_request(broadcast, "%d %x %s", KEY_CHANGED, rand(), myself->name);
+	for(node = connection_tree->head; node; node = node->next) {
+		c = node->data;
+		if(c->status.active && c->node && c->node->status.reachable)
+			send_ans_key(c->node);
+	}
 }
 
 bool key_changed_h(connection_t *c) {
@@ -225,7 +229,7 @@ bool ans_key_h(connection_t *c) {
 			return true;
 		}
 
-		if(!*address) {
+		if(!*address && from->address.sa.sa_family != AF_UNSPEC) {
 			char *address, *port;
 			ifdebug(PROTOCOL) logger(LOG_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
 			sockaddr2str(&from->address, &address, &port);