X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=fb53fe141927322e3ce2a706540e8ef7497d8315;hb=0b8b23e0dd7219344543f135ca0aeba8a4a42d48;hp=3e8d29adfc4df0883dd224b23bab896951671b6c;hpb=bb6b97ce3493d49b79f1bd57fdac420c312ef8d6;p=meshlink

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 3e8d29ad..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);
-		}
 	}
 }
 
@@ -181,6 +171,22 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
 			return true;
 		}
 
+		case REQ_PACKET: {
+			if(!from->status.validkey) {
+				logger(DEBUG_PROTOCOL, LOG_ERR, "Got REQ_PACKET from %s (%s) but we don't have a valid key yet", from->name, from->hostname);
+				return true;
+			}
+
+			char buf[MAX_STRING_SIZE];
+			if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1) {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "REQ_KEY", from->name, from->hostname, "invalid SPTPS data");
+				return true;
+			}
+			int len = b64decode(buf, buf, strlen(buf));
+			sptps_receive_data(&from->sptps, buf, len);
+			return true;
+		}
+
 		default:
 			logger(DEBUG_ALWAYS, LOG_ERR, "Unknown extended REQ_KEY request from %s (%s): %s", from->name, from->hostname, request);
 			return true;