Try to get a new reflexive UDP address if UDP probes failed.

[meshlink] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index c1ffe322aa06ce24046494923ad4e8cdece13a73..f912c0fb44431c6f33ee625fda372eb5fa3187e0 100644 (file)
--- 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;
@@ -96,7 +105,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 +141,20 @@ 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
+                               });
+                       }
+               }
+
+               /* Also reset any UTCP timers */
+               utcp_reset_timers(from->utcp);
+
                return true;
        }
 
@@ -146,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;
                        }
@@ -196,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;
@@ -250,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];
@@ -302,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);
@@ -315,24 +338,24 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                return send_request(mesh, to->nexthop->connection, NULL, "%s", request);
        }
 
-       /* Don't use key material until every check has passed. */
-       from->status.validkey = false;
-
-       /* Compression is not supported. */
-       if(compression != 0) {
-               logger(mesh, MESHLINK_ERROR, "Node %s uses bogus compression level!", from->name);
-               return true;
-       }
+       /* Process SPTPS data if present */
 
-       from->outcompression = compression;
+       if(*key != '.') {
+               /* Don't use key material until every check has passed. */
+               from->status.validkey = false;
 
-       /* SPTPS or old-style key exchange? */
+               /* Compression is not supported. */
+               if(compression != 0) {
+                       logger(mesh, MESHLINK_ERROR, "Node %s uses bogus compression level!", from->name);
+                       return true;
+               }
 
-       char buf[strlen(key)];
-       int len = b64decode(key, buf, strlen(key));
+               char buf[strlen(key)];
+               int len = b64decode(key, buf, strlen(key));
 
-       if(!len || !sptps_receive_data(&from->sptps, buf, len)) {
-               logger(mesh, MESHLINK_ERROR, "Error processing SPTPS data from %s", from->name);
+               if(!len || !sptps_receive_data(&from->sptps, buf, len)) {
+                       logger(mesh, MESHLINK_ERROR, "Error processing SPTPS data from %s", from->name);
+               }
        }
 
        if(from->status.validkey) {
@@ -342,9 +365,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;