From f8b70fde46ec1e0f0737b4c5ef66b6ad8720a0b1 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 18 Aug 2019 16:58:29 +0200 Subject: [PATCH] Ignore REQ_KEY only if we very recently sent one ourselves. In case the SPTPS state between two nodes becomes desynchronized, we must allow a new SPTPS connection to be set up eventually. --- src/protocol_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocol_key.c b/src/protocol_key.c index 17925298..2fbbe126 100644 --- a/src/protocol_key.c +++ b/src/protocol_key.c @@ -156,7 +156,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 + mesh->pingtimeout / 2 && strcmp(mesh->self->name, from->name) < 0) { logger(mesh, MESHLINK_DEBUG, "Ignoring REQ_KEY from %s.", from->name); return true; } -- 2.39.5