X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=836737aa7e284e2c11886707d02088ad5a1846a9;hb=771c923ba3d6e2122d822cd1ebd38373020dc422;hp=64a0ce8faff20b743ed81740d925fe613dd04793;hpb=6354733cc5044c5226c430d97262c06ab4cd0d5e;p=meshlink

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 64a0ce8f..836737aa 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -31,6 +31,8 @@
 #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);
 
@@ -96,7 +98,6 @@ bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
 	to->status.validkey = false;
 	to->status.waitingforkey = true;
 	to->last_req_key = mesh->loop.now.tv_sec;
-	to->incompression = mesh->self->incompression;
 	return sptps_start(&to->sptps, to, true, true, mesh->private_key, to->ecdsa, label, sizeof(label) - 1, send_initial_sptps_data, receive_sptps_record);
 }
 
@@ -144,6 +145,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;
 	}
 
@@ -157,7 +161,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;
 			}
@@ -335,8 +339,6 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		return true;
 	}
 
-	from->outcompression = compression;
-
 	/* SPTPS or old-style key exchange? */
 
 	char buf[strlen(key)];
@@ -353,9 +355,7 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 			update_node_udp(mesh, from, &sa);
 		}
 
-		if(from->options & OPTION_PMTU_DISCOVERY && !(from->options & OPTION_TCPONLY)) {
-			send_mtu_probe(mesh, from);
-		}
+		send_mtu_probe(mesh, from);
 	}
 
 	return true;