X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=1d708e4a3bb2fc3b70a6468f446c5a6f04aac307;hb=a5750efefc491d77ff6a45f0ebc21976831eebfe;hp=179252984e1c3856947ba2569a86ba6e6d2b324c;hpb=282b99f3c71705bd6e34d4e4f9e8369ea63c87ed;p=meshlink

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 17925298..1d708e4a 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -31,8 +31,10 @@
 #include "utils.h"
 #include "xalloc.h"
 
+static const int req_key_timeout = 2;
+
 void send_key_changed(meshlink_handle_t *mesh) {
-	send_request(mesh, mesh->everyone, NULL, "%d %x %s", KEY_CHANGED, rand(), mesh->self->name);
+	send_request(mesh, mesh->everyone, NULL, "%d %x %s", KEY_CHANGED, prng(mesh, UINT_MAX), mesh->self->name);
 
 	/* Force key exchange for connections using SPTPS */
 
@@ -43,6 +45,9 @@ void send_key_changed(meshlink_handle_t *mesh) {
 }
 
 bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	char name[MAX_STRING_SIZE];
 	node_t *n;
 
@@ -71,6 +76,10 @@ bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request
 
 static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
 	(void)type;
+
+	assert(data);
+	assert(len);
+
 	node_t *to = handle;
 	meshlink_handle_t *mesh = to->mesh;
 	to->sptps.send_data = send_sptps_data;
@@ -143,6 +152,9 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 			}
 		}
 
+		/* Also reset any UTCP timers */
+		utcp_reset_timers(from->utcp);
+
 		return true;
 	}
 
@@ -156,7 +168,7 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 		if(from->sptps.label) {
 			logger(mesh, MESHLINK_DEBUG, "Got REQ_KEY from %s while we already started a SPTPS session!", from->name);
 
-			if(strcmp(mesh->self->name, from->name) < 0) {
+			if(mesh->loop.now.tv_sec < from->last_req_key + req_key_timeout && strcmp(mesh->self->name, from->name) < 0) {
 				logger(mesh, MESHLINK_DEBUG, "Ignoring REQ_KEY from %s.", from->name);
 				return true;
 			}
@@ -206,6 +218,9 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 }
 
 bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
@@ -260,13 +275,10 @@ bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	return true;
 }
 
-bool send_ans_key(meshlink_handle_t *mesh, node_t *to) {
-	(void)mesh;
-	(void)to;
-	abort();
-}
-
 bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	char key[MAX_STRING_SIZE];
@@ -312,7 +324,8 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 			return true;
 		}
 
-		if(!*address && from->address.sa.sa_family != AF_UNSPEC) {
+		/* Append the known UDP address of the from node, if we have a confirmed one */
+		if(!*address && from->status.udp_confirmed && from->address.sa.sa_family != AF_UNSPEC) {
 			char *address, *port;
 			logger(mesh, MESHLINK_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
 			sockaddr2str(&from->address, &address, &port);