Ignore REQ_KEY only if we very recently sent one ourselves.

[meshlink] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index c1ffe322aa06ce24046494923ad4e8cdece13a73..2fbbe126e7d22dbc43396889366d1d9fcf1b1239 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -96,7 +96,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);
 }
 
@@ -133,6 +132,17 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 
                logger(mesh, MESHLINK_INFO, "Learned ECDSA public key from %s", from->name);
                from->status.dirty = true;
+
+               /* If we are trying to form an outgoing connection to this node, retry immediately */
+               for list_each(outgoing_t, outgoing, mesh->outgoings) {
+                       if(outgoing->node == from && outgoing->ev.cb) {
+                               outgoing->timeout = 0;
+                               timeout_set(&mesh->loop, &outgoing->ev, &(struct timeval) {
+                                       0, 0
+                               });
+                       }
+               }
+
                return true;
        }
 
@@ -146,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;
                        }
@@ -324,8 +334,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)];
@@ -342,9 +350,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;