X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=fb53fe141927322e3ce2a706540e8ef7497d8315;hb=0b8b23e0dd7219344543f135ca0aeba8a4a42d48;hp=f34a70da103dc1f2830090f8a2ccee7901f1dd07;hpb=c2a9ed9e98e3dc4218c74fff774ddfe654adfd72;p=tinc

diff --git a/src/protocol_key.c b/src/protocol_key.c
index f34a70da..fb53fe14 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -20,7 +20,6 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
 #include "cipher.h"
 #include "connection.h"
 #include "crypto.h"
@@ -37,29 +36,20 @@
 static bool mykeyused = false;
 
 void send_key_changed(void) {
-	splay_node_t *node;
-	connection_t *c;
-
 	send_request(everyone, "%d %x %s", KEY_CHANGED, rand(), myself->name);
 
 	/* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
 
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
-		if(c->status.active && c->node && c->node->status.reachable) {
-			if(!c->node->status.sptps)
-				send_ans_key(c->node);
-		}
-	}
+	for list_each(connection_t, c, connection_list)
+		if(c->status.active && c->node && c->node->status.reachable && !c->node->status.sptps)
+			send_ans_key(c->node);
 
 	/* Force key exchange for connections using SPTPS */
 
 	if(experimental) {
-		for(node = node_tree->head; node; node = node->next) {
-			node_t *n = node->data;
+		for splay_each(node_t, n, node_tree)
 			if(n->status.reachable && n->status.validkey && n->status.sptps)
 				sptps_force_kex(&n->sptps);
-		}
 	}
 }