X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=745845a650ebd0453660e53301a0cbc056459931;hb=HEAD;hp=2dcb5e8d66debc9d8e814e53d3e624598e01fbbf;hpb=d65d4f25019af86563cc10d00fecce82e861e0a1;p=meshlink

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 2dcb5e8d..745845a6 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -83,6 +83,14 @@ static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data
 	return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_KEY, buf);
 }
 
+bool send_canonical_address(meshlink_handle_t *mesh, node_t *to) {
+	if(!mesh->self->canonical_address) {
+		return true;
+	}
+
+	return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_CANONICAL, mesh->self->canonical_address);
+}
+
 bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
 	if(!node_read_public_key(mesh, to)) {
 		logger(mesh, MESHLINK_DEBUG, "No ECDSA key known for %s", to->name);
@@ -102,6 +110,9 @@ bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
 		logger(mesh, MESHLINK_DEBUG, "send_req_key(%s) called while sptps->label != NULL!", to->name);
 	}
 
+	/* Send our canonical address to help with UDP hole punching */
+	send_canonical_address(mesh, to);
+
 	char label[sizeof(meshlink_udp_label) + strlen(mesh->self->name) + strlen(to->name) + 2];
 	snprintf(label, sizeof(label), "%s %s %s", meshlink_udp_label, mesh->self->name, to->name);
 	sptps_stop(&to->sptps);
@@ -135,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
+				}
 			}
 		}
 
@@ -159,6 +177,10 @@ 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(!node_write_config(mesh, from, true)) {
+			// ignore
+		}
+
 		/* 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) {
@@ -206,6 +228,9 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 		from->status.waitingforkey = true;
 		from->last_req_key = mesh->loop.now.tv_sec;
 
+		/* Send our canonical address to help with UDP hole punching */
+		send_canonical_address(mesh, from);
+
 		if(!sptps_start(&from->sptps, from, false, true, mesh->private_key, from->ecdsa, label, sizeof(label) - 1, send_sptps_data, receive_sptps_record)) {
 			logger(mesh, MESHLINK_ERROR, "Could not start SPTPS session with %s: %s", from->name, strerror(errno));
 			return true;
@@ -241,6 +266,27 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 		return true;
 	}
 
+	case REQ_CANONICAL: {
+		char host[MAX_STRING_SIZE];
+		char port[MAX_STRING_SIZE];
+
+		if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING " " MAX_STRING, host, port) != 2) {
+			logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "REQ_CANONICAL", from->name, "invalid canonical address");
+			return true;
+		}
+
+		char *canonical_address;
+		xasprintf(&canonical_address, "%s %s", host, port);
+
+		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);
+		}
+
+		free(from->canonical_address);
+		from->canonical_address = canonical_address;
+		return true;
+	}
+
 	default:
 		logger(mesh, MESHLINK_ERROR, "Unknown extended REQ_KEY request from %s: %s", from->name, request);
 		return true;
@@ -299,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);
 	}
 
@@ -365,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;