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

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 2c741be5..2dcb5e8d 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -71,6 +71,12 @@ static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data
 
 	node_t *to = handle;
 	meshlink_handle_t *mesh = to->mesh;
+
+	if(!to->nexthop || !to->nexthop->connection) {
+		logger(mesh, MESHLINK_WARNING, "Cannot send SPTPS data to %s via %s", to->name, to->nexthop ? to->nexthop->name : to->name);
+		return false;
+	}
+
 	to->sptps.send_data = send_sptps_data;
 	char buf[len * 4 / 3 + 5];
 	b64encode(data, buf, len);
@@ -80,7 +86,15 @@ static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data
 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);
-		send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
+
+		if(!to->nexthop || !to->nexthop->connection) {
+			logger(mesh, MESHLINK_WARNING, "Cannot send REQ_PUBKEY to %s via %s", to->name, to->nexthop ? to->nexthop->name : to->name);
+			return true;
+		}
+
+		char *pubkey = ecdsa_get_base64_public_key(mesh->private_key);
+		send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY, pubkey);
+		free(pubkey);
 		return true;
 	}
 
@@ -102,12 +116,26 @@ bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
 static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *request, node_t *from, int reqno) {
 	(void)c;
 
+	if(!from->nexthop || !from->nexthop->connection) {
+		logger(mesh, MESHLINK_WARNING, "Cannot answer REQ_KEY from %s via %s", from->name, from->nexthop ? from->nexthop->name : from->name);
+		return true;
+	}
+
 	switch(reqno) {
 	case REQ_PUBKEY: {
 		char *pubkey = ecdsa_get_base64_public_key(mesh->private_key);
 
-		if(!from->nexthop || !from->nexthop->connection) {
-			return false;
+		if(!node_read_public_key(mesh, from)) {
+			char hiskey[MAX_STRING_SIZE];
+
+			if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, hiskey) == 1) {
+				from->ecdsa = ecdsa_set_base64_public_key(hiskey);
+
+				if(!from->ecdsa) {
+					logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "REQ_PUBKEY", from->name, "invalid pubkey");
+					return true;
+				}
+			}
 		}
 
 		send_request(mesh, from->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, from->name, ANS_PUBKEY, pubkey);
@@ -265,7 +293,7 @@ bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		/* This should never happen. Ignore it, unless it came directly from the connected peer, in which case we disconnect. */
 		return from->connection != c;
 	} else {
-		if(!to->status.reachable) {
+		if(!to->status.reachable || !to->nexthop || !to->nexthop->connection) {
 			logger(mesh, MESHLINK_WARNING, "Got %s from %s destination %s which is not reachable",
 			       "REQ_KEY", c->name, to_name);
 			return true;
@@ -332,6 +360,11 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 			return true;
 		}
 
+		if(!to->nexthop || !to->nexthop->connection) {
+			logger(mesh, MESHLINK_WARNING, "Cannot forward ANS_KEY to %s via %s", to->name, to->nexthop ? to->nexthop->name : to->name);
+			return false;
+		}
+
 		/* 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;
@@ -366,6 +399,10 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 					continue;
 				}
 
+				if(!n->nexthop->connection) {
+					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);
 			}