X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=480019e7798c484c8a24288ca3e5ddd7e406050f;hb=HEAD;hp=b2ba50fe14de198573fc1a9424c6b2e6ddf28327;hpb=1bfd9ff74fb8618fd6accb6716331536a36f032a;p=meshlink diff --git a/src/protocol_key.c b/src/protocol_key.c index b2ba50fe..745845a6 100644 --- a/src/protocol_key.c +++ b/src/protocol_key.c @@ -278,7 +278,7 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char * char *canonical_address; xasprintf(&canonical_address, "%s %s", host, port); - if(mesh->log_level <= MESHLINK_DEBUG && strcmp(from->canonical_address, canonical_address)) { + 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); } @@ -345,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); } @@ -411,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;