X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=480019e7798c484c8a24288ca3e5ddd7e406050f;hb=HEAD;hp=6a2946eb8d6ca22be39d3cbcea42fcb0a9c181d3;hpb=42c2dd52c43dceb72127e3a02103ea8338c8dae2;p=meshlink

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 6a2946eb..745845a6 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -275,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;
 	}
 
@@ -346,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);
 	}
 
@@ -412,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;