X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=0746e1c24e8a0b3a99bbd22dcef659b7abd6de37;hb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;hp=59ca7db499e540bc331dcd34e7848f078597567f;hpb=eb049936ffce049cf6b53de8ca0f39c98a360363;p=meshlink

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 59ca7db4..0746e1c2 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -19,9 +19,7 @@
 
 #include "system.h"
 
-#include "cipher.h"
 #include "connection.h"
-#include "crypto.h"
 #include "logger.h"
 #include "meshlink_internal.h"
 #include "net.h"
@@ -33,10 +31,8 @@
 #include "utils.h"
 #include "xalloc.h"
 
-static bool mykeyused = false;
-
-void send_key_changed(void) {
-	send_request(mesh->everyone, "%d %x %s", KEY_CHANGED, rand(), mesh->self->name);
+void send_key_changed(meshlink_handle_t *mesh) {
+	send_request(mesh, mesh->everyone, "%d %x %s", KEY_CHANGED, rand(), mesh->self->name);
 
 	/* Force key exchange for connections using SPTPS */
 
@@ -45,7 +41,7 @@ void send_key_changed(void) {
 			sptps_force_kex(&n->sptps);
 }
 
-bool key_changed_h(connection_t *c, const char *request) {
+bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char name[MAX_STRING_SIZE];
 	node_t *n;
 
@@ -55,10 +51,10 @@ bool key_changed_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	if(seen_request(request))
+	if(seen_request(mesh, request))
 		return true;
 
-	n = lookup_node(name);
+	n = lookup_node(mesh, name);
 
 	if(!n) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) origin %s which does not exist",
@@ -68,23 +64,24 @@ bool key_changed_h(connection_t *c, const char *request) {
 
 	/* Tell the others */
 
-	forward_request(c, request);
+	forward_request(mesh, c, request);
 
 	return true;
 }
 
-static bool send_initial_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
+static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
 	node_t *to = handle;
+	meshlink_handle_t *mesh = to->mesh;
 	to->sptps.send_data = send_sptps_data;
 	char buf[len * 4 / 3 + 5];
 	b64encode(data, buf, len);
-	return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_KEY, buf);
+	return send_request(mesh, to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_KEY, buf);
 }
 
-bool send_req_key(node_t *to) {
-	if(!node_read_ecdsa_public_key(to)) {
+bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
+	if(!node_read_ecdsa_public_key(mesh, to)) {
 		logger(DEBUG_PROTOCOL, LOG_DEBUG, "No ECDSA key known for %s (%s)", to->name, to->hostname);
-		send_request(to->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
+		send_request(mesh, to->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
 		return true;
 	}
 
@@ -96,24 +93,24 @@ bool send_req_key(node_t *to) {
 	sptps_stop(&to->sptps);
 	to->status.validkey = false;
 	to->status.waitingforkey = true;
-	to->last_req_key = now.tv_sec;
+	to->last_req_key = mesh->loop.now.tv_sec;
 	to->incompression = mesh->self->incompression;
 	return sptps_start(&to->sptps, to, true, true, mesh->self->connection->ecdsa, to->ecdsa, label, sizeof label, send_initial_sptps_data, receive_sptps_record);
 }
 
 /* REQ_KEY is overloaded to allow arbitrary requests to be routed between two nodes. */
 
-static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, int reqno) {
+static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *request, node_t *from, int reqno) {
 	switch(reqno) {
 		case REQ_PUBKEY: {
 			char *pubkey = ecdsa_get_base64_public_key(mesh->self->connection->ecdsa);
-			send_request(from->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, from->name, ANS_PUBKEY, pubkey);
+			send_request(mesh, from->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, from->name, ANS_PUBKEY, pubkey);
 			free(pubkey);
 			return true;
 		}
 
 		case ANS_PUBKEY: {
-			if(node_read_ecdsa_public_key(from)) {
+			if(node_read_ecdsa_public_key(mesh, from)) {
 				logger(DEBUG_PROTOCOL, LOG_WARNING, "Got ANS_PUBKEY from %s (%s) even though we already have his pubkey", from->name, from->hostname);
 				return true;
 			}
@@ -125,14 +122,14 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
 			}
 
 			logger(DEBUG_PROTOCOL, LOG_INFO, "Learned ECDSA public key from %s (%s)", from->name, from->hostname);
-			append_config_file(from->name, "ECDSAPublicKey", pubkey);
+			append_config_file(mesh, from->name, "ECDSAPublicKey", pubkey);
 			return true;
 		}
 
 		case REQ_KEY: {
-			if(!node_read_ecdsa_public_key(from)) {
+			if(!node_read_ecdsa_public_key(mesh, from)) {
 				logger(DEBUG_PROTOCOL, LOG_DEBUG, "No ECDSA key known for %s (%s)", from->name, from->hostname);
-				send_request(from->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, from->name, REQ_PUBKEY);
+				send_request(mesh, from->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, from->name, REQ_PUBKEY);
 				return true;
 			}
 
@@ -152,7 +149,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
 			sptps_stop(&from->sptps);
 			from->status.validkey = false;
 			from->status.waitingforkey = true;
-			from->last_req_key = now.tv_sec;
+			from->last_req_key = mesh->loop.now.tv_sec;
 			sptps_start(&from->sptps, from, false, true, mesh->self->connection->ecdsa, from->ecdsa, label, sizeof label, send_sptps_data, receive_sptps_record);
 			sptps_receive_data(&from->sptps, buf, len);
 			return true;
@@ -180,7 +177,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
 	}
 }
 
-bool req_key_h(connection_t *c, const char *request) {
+bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
@@ -197,7 +194,7 @@ bool req_key_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	from = lookup_node(from_name);
+	from = lookup_node(mesh, from_name);
 
 	if(!from) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
@@ -205,7 +202,7 @@ bool req_key_h(connection_t *c, const char *request) {
 		return true;
 	}
 
-	to = lookup_node(to_name);
+	to = lookup_node(mesh, to_name);
 
 	if(!to) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
@@ -218,10 +215,10 @@ bool req_key_h(connection_t *c, const char *request) {
 	if(to == mesh->self) {                      /* Yes */
 		/* Is this an extended REQ_KEY message? */
 		if(reqno)
-			return req_key_ext_h(c, request, from, reqno);
+			return req_key_ext_h(mesh, c, request, from, reqno);
 
 		/* No, just send our key back */
-		send_ans_key(from);
+		send_ans_key(mesh, from);
 	} else {
 		if(!to->status.reachable) {
 			logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
@@ -229,23 +226,23 @@ bool req_key_h(connection_t *c, const char *request) {
 			return true;
 		}
 
-		send_request(to->nexthop->connection, "%s", request);
+		send_request(mesh, to->nexthop->connection, "%s", request);
 	}
 
 	return true;
 }
 
-bool send_ans_key(node_t *to) {
+bool send_ans_key(meshlink_handle_t *mesh, node_t *to) {
 	abort();
 }
 
-bool ans_key_h(connection_t *c, const char *request) {
+bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	char key[MAX_STRING_SIZE];
 	char address[MAX_STRING_SIZE] = "";
 	char port[MAX_STRING_SIZE] = "";
-	int cipher, digest, maclength, compression, keylen;
+	int cipher, digest, maclength, compression;
 	node_t *from, *to;
 
 	if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d "MAX_STRING" "MAX_STRING,
@@ -261,7 +258,7 @@ bool ans_key_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	from = lookup_node(from_name);
+	from = lookup_node(mesh, from_name);
 
 	if(!from) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
@@ -269,7 +266,7 @@ bool ans_key_h(connection_t *c, const char *request) {
 		return true;
 	}
 
-	to = lookup_node(to_name);
+	to = lookup_node(mesh, to_name);
 
 	if(!to) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
@@ -290,13 +287,13 @@ bool ans_key_h(connection_t *c, const char *request) {
 			char *address, *port;
 			logger(DEBUG_PROTOCOL, LOG_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
 			sockaddr2str(&from->address, &address, &port);
-			send_request(to->nexthop->connection, "%s %s %s", request, address, port);
+			send_request(mesh, to->nexthop->connection, "%s %s %s", request, address, port);
 			free(address);
 			free(port);
 			return true;
 		}
 
-		return send_request(to->nexthop->connection, "%s", request);
+		return send_request(mesh, to->nexthop->connection, "%s", request);
 	}
 
 	/* Don't use key material until every check has passed. */
@@ -321,11 +318,11 @@ bool ans_key_h(connection_t *c, const char *request) {
 		if(*address && *port) {
 			logger(DEBUG_PROTOCOL, LOG_DEBUG, "Using reflexive UDP address from %s: %s port %s", from->name, address, port);
 			sockaddr_t sa = str2sockaddr(address, port);
-			update_node_udp(from, &sa);
+			update_node_udp(mesh, from, &sa);
 		}
 
 		if(from->options & OPTION_PMTU_DISCOVERY && !(from->options & OPTION_TCPONLY))
-			send_mtu_probe(from);
+			send_mtu_probe(mesh, from);
 	}
 
 	return true;