Never automatically try to bind to ports >= 32768.

[meshlink] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 693b96db5e11f09d12bc77814dd801a1e07da6c8..745845a650ebd0453660e53301a0cbc056459931 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -146,6 +146,13 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
                                        logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "REQ_PUBKEY", from->name, "invalid pubkey");
                                        return true;
                                }
+
+                               logger(mesh, MESHLINK_INFO, "Learned ECDSA public key from %s", from->name);
+                               from->status.dirty = true;
+
+                               if(!node_write_config(mesh, from, true)) {
+                                       // ignore
+                               }
                        }
                }
 
@@ -268,16 +275,15 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
                        return true;
                }
 
-               strncat(host, " ", MAX_STRING_SIZE - 1);
-               strncat(host, port, MAX_STRING_SIZE - 1);
+               char *canonical_address;
+               xasprintf(&canonical_address, "%s %s", host, port);
 
-               if(from->canonical_address && !strcmp(from->canonical_address, host)) {
-                       return true;
+               if(mesh->log_level <= MESHLINK_DEBUG && (!from->canonical_address || strcmp(from->canonical_address, canonical_address))) {
+                       logger(mesh, MESHLINK_DEBUG, "Updating canonical address of %s to %s", from->name, canonical_address);
                }
 
-               logger(mesh, MESHLINK_DEBUG, "Updating canonical address of %s to %s", from->name, host);
                free(from->canonical_address);
-               from->canonical_address = xstrdup(host);
+               from->canonical_address = canonical_address;
                return true;
        }
 
@@ -339,6 +345,10 @@ bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                        return true;
                }
 
+               size_t len = strlen(request);
+               from->in_forward += len + SPTPS_OVERHEAD;
+               to->out_forward += len + SPTPS_OVERHEAD;
+
                send_request(mesh, to->nexthop->connection, NULL, "%s", request);
        }
 
@@ -405,6 +415,11 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                        return false;
                }
 
+               /* TODO: find a good way to avoid the use of strlen() */
+               size_t len = strlen(request);
+               from->in_forward += len + SPTPS_OVERHEAD;
+               to->out_forward += len + SPTPS_OVERHEAD;
+
                /* 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 *reflexive_address, *reflexive_port;