X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=43a227bbd65b459aaf7254a5069609ff2a1ea6f7;hb=9b82ebf0b67e13a597ce069a96b1e214ef89750c;hp=6384eb3979d9d92154e963913a4763693f13dd1b;hpb=ea294dac41365a08a77b64c62c0ba630292d7a07;p=meshlink

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 6384eb39..43a227bb 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -1,6 +1,6 @@
 /*
     protocol_key.c -- handle the meta-protocol, key exchange
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -32,13 +32,14 @@
 #include "xalloc.h"
 
 void send_key_changed(meshlink_handle_t *mesh) {
-	send_request(mesh, mesh->everyone, "%d %x %s", KEY_CHANGED, rand(), mesh->self->name);
+	send_request(mesh, mesh->everyone, NULL, "%d %x %s", KEY_CHANGED, rand(), 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)
+		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) {
@@ -50,8 +51,9 @@ bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request
 		return false;
 	}
 
-	if(seen_request(mesh, request))
+	if(seen_request(mesh, request)) {
 		return true;
+	}
 
 	n = lookup_node(mesh, name);
 
@@ -62,29 +64,31 @@ bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request
 
 	/* Tell the others */
 
-	forward_request(mesh, c, request);
+	forward_request(mesh, c, NULL, request);
 
 	return true;
 }
 
 static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
+	(void)type;
 	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(mesh, 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, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_KEY, buf);
 }
 
 bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
 	if(!node_read_ecdsa_public_key(mesh, to)) {
 		logger(mesh, MESHLINK_DEBUG, "No ECDSA key known for %s", to->name);
-		send_request(mesh, to->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
+		send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
 		return true;
 	}
 
-	if(to->sptps.label)
+	if(to->sptps.label) {
 		logger(mesh, MESHLINK_DEBUG, "send_req_key(%s) called while sptps->label != NULL!", to->name);
+	}
 
 	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);
@@ -99,10 +103,17 @@ bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
 /* REQ_KEY is overloaded to allow arbitrary requests to be routed between two nodes. */
 
 static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *request, node_t *from, int reqno) {
+	(void)c;
+
 	switch(reqno) {
 	case REQ_PUBKEY: {
 		char *pubkey = ecdsa_get_base64_public_key(mesh->self->connection->ecdsa);
-		send_request(mesh, from->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, from->name, ANS_PUBKEY, pubkey);
+
+		if(!from->nexthop || !from->nexthop->connection) {
+			return false;
+		}
+
+		send_request(mesh, from->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, from->name, ANS_PUBKEY, pubkey);
 		free(pubkey);
 		return true;
 	}
@@ -114,6 +125,7 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 		}
 
 		char pubkey[MAX_STRING_SIZE];
+
 		if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, pubkey) != 1 || !(from->ecdsa = ecdsa_set_base64_public_key(pubkey))) {
 			logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ANS_PUBKEY", from->name, "invalid pubkey");
 			return true;
@@ -127,12 +139,13 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 	case REQ_KEY: {
 		if(!node_read_ecdsa_public_key(mesh, from)) {
 			logger(mesh, MESHLINK_DEBUG, "No ECDSA key known for %s", from->name);
-			send_request(mesh, from->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, from->name, REQ_PUBKEY);
+			send_request(mesh, from->nexthop->connection, NULL, "%d %s %s %d", REQ_KEY, mesh->self->name, from->name, REQ_PUBKEY);
 			return true;
 		}
 
 		if(from->sptps.label) {
 			logger(mesh, MESHLINK_DEBUG, "Got REQ_KEY from %s while we already started a SPTPS session!", from->name);
+
 			if(strcmp(mesh->self->name, from->name) < 0) {
 				logger(mesh, MESHLINK_DEBUG, "Ignoring REQ_KEY from %s.", from->name);
 				return true;
@@ -166,10 +179,12 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 
 		char buf[MAX_STRING_SIZE];
 		int len;
+
 		if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode(buf, buf, strlen(buf)))) {
 			logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "REQ_SPTPS", from->name, "invalid SPTPS data");
 			return true;
 		}
+
 		sptps_receive_data(&from->sptps, buf, len);
 		return true;
 	}
@@ -216,11 +231,12 @@ bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	if(to == mesh->self) {                      /* Yes */
 		/* Is this an extended REQ_KEY message? */
-		if(reqno)
+		if(reqno) {
 			return req_key_ext_h(mesh, c, request, from, reqno);
+		}
 
-		/* No, just send our key back */
-		send_ans_key(mesh, from);
+		/* 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) {
 			logger(mesh, MESHLINK_WARNING, "Got %s from %s destination %s which is not reachable",
@@ -228,13 +244,15 @@ bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 			return true;
 		}
 
-		send_request(mesh, to->nexthop->connection, "%s", request);
+		send_request(mesh, to->nexthop->connection, NULL, "%s", request);
 	}
 
 	return true;
 }
 
 bool send_ans_key(meshlink_handle_t *mesh, node_t *to) {
+	(void)mesh;
+	(void)to;
 	abort();
 }
 
@@ -288,13 +306,13 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 			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);
-			send_request(mesh, to->nexthop->connection, "%s %s %s", request, address, port);
+			send_request(mesh, to->nexthop->connection, NULL, "%s %s %s", request, address, port);
 			free(address);
 			free(port);
 			return true;
 		}
 
-		return send_request(mesh, to->nexthop->connection, "%s", request);
+		return send_request(mesh, to->nexthop->connection, NULL, "%s", request);
 	}
 
 	/* Don't use key material until every check has passed. */
@@ -313,8 +331,9 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char buf[strlen(key)];
 	int len = b64decode(key, buf, strlen(key));
 
-	if(!len || !sptps_receive_data(&from->sptps, buf, len))
+	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) {
 		if(*address && *port) {
@@ -323,8 +342,9 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 			update_node_udp(mesh, from, &sa);
 		}
 
-		if(from->options & OPTION_PMTU_DISCOVERY && !(from->options & OPTION_TCPONLY))
+		if(from->options & OPTION_PMTU_DISCOVERY && !(from->options & OPTION_TCPONLY)) {
 			send_mtu_probe(mesh, from);
+		}
 	}
 
 	return true;