X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=b614494b74b55cc2b41fdc0daaffa7f1ef00ff9a;hp=9f69d803b6800c7f314f1ff7df17c40a49485093;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=ea20fcfcded669ce8fbbda3a1f93f354ed254603

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 9f69d803..b614494b 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -33,17 +33,6 @@
 
 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, prng(mesh, UINT_MAX), mesh->self->name);
-
-	/* Force key exchange for connections using SPTPS */
-
-	for splay_each(node_t, n, mesh->nodes)
-		if(n->status.reachable && n->status.validkey) {
-			sptps_force_kex(&n->sptps);
-		}
-}
-
 bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	assert(request);
 	assert(*request);
@@ -146,7 +135,7 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 		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) {
+				timeout_set(&mesh->loop, &outgoing->ev, &(struct timespec) {
 					0, 0
 				});
 			}
@@ -188,8 +177,17 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 		from->status.validkey = false;
 		from->status.waitingforkey = true;
 		from->last_req_key = mesh->loop.now.tv_sec;
-		sptps_start(&from->sptps, from, false, true, mesh->private_key, from->ecdsa, label, sizeof(label) - 1, send_sptps_data, receive_sptps_record);
-		sptps_receive_data(&from->sptps, buf, len);
+
+		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;
+		}
+
+		if(!sptps_receive_data(&from->sptps, buf, len)) {
+			logger(mesh, MESHLINK_ERROR, "Could not process SPTPS data from %s: %s", from->name, strerror(errno));
+			return true;
+		}
+
 		return true;
 	}
 
@@ -207,7 +205,11 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 			return true;
 		}
 
-		sptps_receive_data(&from->sptps, buf, len);
+		if(!sptps_receive_data(&from->sptps, buf, len)) {
+			logger(mesh, MESHLINK_ERROR, "Could not process SPTPS data from %s: %s", from->name, strerror(errno));
+			return true;
+		}
+
 		return true;
 	}
 
@@ -324,7 +326,14 @@ 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) {
+		if(from == to) {
+			logger(mesh, MESHLINK_WARNING, "Got %s from %s from %s to %s",
+			       "ANS_KEY", c->name, from_name, to_name);
+			return true;
+		}
+
+		/* 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);
@@ -337,22 +346,55 @@ 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;
+	/* Is this an ANS_KEY informing us of our own reflexive UDP address? */
+
+	if(from == mesh->self) {
+		if(*key == '.' && *address && *port) {
+			logger(mesh, MESHLINK_DEBUG, "Learned our own reflexive UDP address from %s: %s port %s", c->name, address, port);
+
+			/* Inform all other nodes we want to communicate with and which are reachable via this connection */
+			for splay_each(node_t, n, mesh->nodes) {
+				if(n->nexthop != c->node) {
+					continue;
+				}
+
+				if(n->status.udp_confirmed) {
+					continue;
+				}
+
+				if(!n->status.waitingforkey && !n->status.validkey) {
+					continue;
+				}
+
+				logger(mesh, MESHLINK_DEBUG, "Forwarding our own reflexive UDP address to %s", n->name);
+				send_request(mesh, c, NULL, "%d %s %s . -1 -1 -1 0 %s %s", ANS_KEY, mesh->self->name, n->name, address, port);
+			}
+		} else {
+			logger(mesh, MESHLINK_WARNING, "Got %s from %s from %s to %s",
+			       "ANS_KEY", c->name, from_name, to_name);
+		}
 
-	/* Compression is not supported. */
-	if(compression != 0) {
-		logger(mesh, MESHLINK_ERROR, "Node %s uses bogus compression level!", from->name);
 		return true;
 	}
 
-	/* SPTPS or old-style key exchange? */
+	/* Process SPTPS data if present */
 
-	char buf[strlen(key)];
-	int len = b64decode(key, buf, strlen(key));
+	if(*key != '.') {
+		/* Don't use key material until every check has passed. */
+		from->status.validkey = false;
 
-	if(!len || !sptps_receive_data(&from->sptps, buf, len)) {
-		logger(mesh, MESHLINK_ERROR, "Error processing SPTPS data from %s", from->name);
+		/* 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));
+
+		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) {