X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=9cb96b6590aecd6dd47f1af1fb23fc2ca694178c;hb=e4e5a81447142da0fb1291b2d2119ed6981b89e5;hp=908f565650a995a3aeed0ea2b94740c79d29a24f;hpb=c4abbbe7593bf721d9759d51bf3213c23b1f23f5;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 908f5656..9cb96b65 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -37,6 +37,10 @@
 #include "xalloc.h"
 #include "ed25519/sha512.h"
 
+#include <assert.h>
+
+extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
+
 static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
 	switch(mesh->proxytype) {
 		case PROXY_HTTP: {
@@ -51,7 +55,7 @@ static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
 		}
 		case PROXY_SOCKS4: {
 			if(c->address.sa.sa_family != AF_INET) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!");
+				logger(mesh, MESHLINK_ERROR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!");
 				return false;
 			}
 			char s4req[9 + (mesh->proxyuser ? strlen(mesh->proxyuser) : 0)];
@@ -105,7 +109,7 @@ static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
 				i += 2;
 				c->tcplen += 22;
 			} else {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family);
+				logger(mesh, MESHLINK_ERROR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family);
 				return false;
 			}
 			if(i > len)
@@ -113,19 +117,18 @@ static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
 			return send_meta(mesh, c, s5req, sizeof s5req);
 		}
 		case PROXY_SOCKS4A:
-			logger(DEBUG_ALWAYS, LOG_ERR, "Proxy type not implemented yet");
+			logger(mesh, MESHLINK_ERROR, "Proxy type not implemented yet");
 			return false;
 		case PROXY_EXEC:
 			return true;
 		default:
-			logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type");
+			logger(mesh, MESHLINK_ERROR, "Unknown proxy type");
 			return false;
 	}
 }
 
 bool send_id(meshlink_handle_t *mesh, connection_t *c) {
-	gettimeofday(&c->start, NULL);
-
+	
 	int minor = mesh->self->connection->protocol_minor;
 
 	if(mesh->proxytype && c->outgoing)
@@ -135,9 +138,9 @@ bool send_id(meshlink_handle_t *mesh, connection_t *c) {
 	return send_request(mesh, c, "%d %s %d.%d", ID, mesh->self->connection->name, mesh->self->connection->protocol_major, minor);
 }
 
-static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const char *data, uint16_t len) {
+static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data, uint16_t len) {
 	if(strchr(data, '\n')) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Received invalid key from invited node %s (%s)!\n", c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Received invalid key from invited node %s (%s)!\n", c->name, c->hostname);
 		return false;
 	}
 
@@ -145,20 +148,20 @@ static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const
 	char filename[PATH_MAX];
 	snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name);
 	if(!access(filename, F_OK)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Host config file for %s (%s) already exists!\n", c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Host config file for %s (%s) already exists!\n", c->name, c->hostname);
 		return false;
 	}
 
 	FILE *f = fopen(filename, "w");
 	if(!f) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error trying to create %s: %s\n", filename, strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Error trying to create %s: %s\n", filename, strerror(errno));
 		return false;
 	}
 
-	fprintf(f, "ECDSAPublicKey = %s\n", data);
+	fprintf(f, "ECDSAPublicKey = %s\n", (const char *)data);
 	fclose(f);
 
-	logger(DEBUG_CONNECTIONS, LOG_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname);
+	logger(mesh, MESHLINK_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname);
 
 	//TODO: callback to application to inform of an accepted invitation
 
@@ -169,7 +172,7 @@ static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const
 	return true;
 }
 
-static bool receive_invitation_sptps(void *handle, uint8_t type, const char *data, uint16_t len) {
+static bool receive_invitation_sptps(void *handle, uint8_t type, const void *data, uint16_t len) {
 	connection_t *c = handle;
 	meshlink_handle_t *mesh = c->mesh;
 
@@ -200,16 +203,16 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const char *dat
 	// Atomically rename the invitation file
 	if(rename(filename, usedname)) {
 		if(errno == ENOENT)
-			logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s tried to use non-existing invitation %s\n", c->hostname, cookie);
+			logger(mesh, MESHLINK_ERROR, "Peer %s tried to use non-existing invitation %s\n", c->hostname, cookie);
 		else
-			logger(DEBUG_ALWAYS, LOG_ERR, "Error trying to rename invitation %s\n", cookie);
+			logger(mesh, MESHLINK_ERROR, "Error trying to rename invitation %s\n", cookie);
 		return false;
 	}
 
 	// Open the renamed file
 	FILE *f = fopen(usedname, "r");
 	if(!f) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error trying to open invitation %s\n", cookie);
+		logger(mesh, MESHLINK_ERROR, "Error trying to open invitation %s\n", cookie);
 		return false;
 	}
 
@@ -229,7 +232,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const char *dat
 	buf[len] = 0;
 
 	if(!*buf || !*name || strcasecmp(buf, "Name") || !check_id(name)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid invitation file %s\n", cookie);
+		logger(mesh, MESHLINK_ERROR, "Invalid invitation file %s\n", cookie);
 		fclose(f);
 		return false;
 	}
@@ -248,7 +251,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const char *dat
 
 	c->status.invitation_used = true;
 
-	logger(DEBUG_CONNECTIONS, LOG_INFO, "Invitation %s succesfully sent to %s (%s)", cookie, c->name, c->hostname);
+	logger(mesh, MESHLINK_INFO, "Invitation %s succesfully sent to %s (%s)", cookie, c->name, c->hostname);
 	return true;
 }
 
@@ -256,7 +259,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char name[MAX_STRING_SIZE];
 
 	if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ID", c->name,
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ID", c->name,
 			   c->hostname);
 		return false;
 	}
@@ -265,13 +268,13 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	if(name[0] == '?') {
 		if(!mesh->invitation_key) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Got invitation from %s but we don't have an invitation key", c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Got invitation from %s but we don't have an invitation key", c->hostname);
 			return false;
 		}
 
 		c->ecdsa = ecdsa_set_base64_public_key(name + 1);
 		if(!c->ecdsa) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Got bad invitation from %s", c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Got bad invitation from %s", c->hostname);
 			return false;
 		}
 
@@ -292,7 +295,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	/* Check if identity is a valid name */
 
 	if(!check_id(name)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ID", c->name,
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ID", c->name,
 			   c->hostname, "invalid name");
 		return false;
 	}
@@ -301,7 +304,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	if(c->outgoing) {
 		if(strcmp(c->name, name)) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s is %s instead of %s", c->hostname, name,
+			logger(mesh, MESHLINK_ERROR, "Peer %s is %s instead of %s", c->hostname, name,
 				   c->name);
 			return false;
 		}
@@ -314,7 +317,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	/* Check if version matches */
 
 	if(c->protocol_major != mesh->self->connection->protocol_major) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) uses incompatible version %d.%d",
+		logger(mesh, MESHLINK_ERROR, "Peer %s (%s) uses incompatible version %d.%d",
 			c->name, c->hostname, c->protocol_major, c->protocol_minor);
 		return false;
 	}
@@ -323,20 +326,29 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		init_configuration(&c->config_tree);
 
 		if(!read_host_config(mesh, c->config_tree, c->name)) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname, c->name);
+			logger(mesh, MESHLINK_ERROR, "Peer %s had unknown identity (%s)", c->hostname, c->name);
 			return false;
 		}
+	}
 
-		read_ecdsa_public_key(mesh, c);
-	} else {
-		if(c->protocol_minor && !ecdsa_active(c->ecdsa))
-			c->protocol_minor = 1;
+	read_ecdsa_public_key(mesh, c);
+
+	if(!ecdsa_active(c->ecdsa)) {
+		logger(mesh, MESHLINK_ERROR, "No key known for peer %s (%s)", c->name, c->hostname);
+
+		node_t *n = lookup_node(mesh, c->name);
+		if(n && !n->status.waitingforkey) {
+			logger(mesh, MESHLINK_INFO, "Requesting key from peer %s (%s)", c->name, c->hostname);
+			send_req_key(mesh, n);
+		}
+
+		return false;
 	}
 
 	/* Forbid version rollback for nodes whose ECDSA key we know */
 
 	if(ecdsa_active(c->ecdsa) && c->protocol_minor < 2) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) tries to roll back protocol version to %d.%d",
+		logger(mesh, MESHLINK_ERROR, "Peer %s (%s) tries to roll back protocol version to %d.%d",
 			c->name, c->hostname, c->protocol_major, c->protocol_minor);
 		return false;
 	}
@@ -353,23 +365,13 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 }
 
 bool send_ack(meshlink_handle_t *mesh, connection_t *c) {
-	/* ACK message contains rest of the information the other end needs
-	   to create node_t and edge_t structures. */
-
-	struct timeval now;
-	bool choice;
-
-	/* Estimate weight */
-
-	gettimeofday(&now, NULL);
-	c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
 
 	/* Check some options */
 
 	if(mesh->self->options & OPTION_PMTU_DISCOVERY)
 		c->options |= OPTION_PMTU_DISCOVERY;
 
-	return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24));
+	return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, (c->options & 0xffffff) | (PROT_MINOR << 24));
 }
 
 static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
@@ -384,17 +386,22 @@ static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
 bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char hisport[MAX_STRING_SIZE];
 	char *hisaddress;
-	int weight, mtu;
+	int devclass;
 	uint32_t options;
 	node_t *n;
-	bool choice;
 
-	if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &weight, &options) != 3) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name,
+	if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &devclass, &options) != 3) {
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ACK", c->name,
 			   c->hostname);
 		return false;
 	}
 
+	if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ACK", c->name,
+			   c->hostname, "devclass invalid");
+		return false;
+	}
+
 	/* Check if we already have a node_t for him */
 
 	n = lookup_node(mesh, c->name);
@@ -406,11 +413,11 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	} else {
 		if(n->connection) {
 			/* Oh dear, we already have a connection to this node. */
-			logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Established a second connection with %s (%s), closing old connection", n->connection->name, n->connection->hostname);
+			logger(mesh, MESHLINK_DEBUG, "Established a second connection with %s (%s), closing old connection", n->connection->name, n->connection->hostname);
 
 			if(n->connection->outgoing) {
 				if(c->outgoing)
-					logger(DEBUG_ALWAYS, LOG_WARNING, "Two outgoing connections to the same node!");
+					logger(mesh, MESHLINK_WARNING, "Two outgoing connections to the same node!");
 				else
 					c->outgoing = n->connection->outgoing;
 
@@ -423,6 +430,9 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		}
 	}
 
+	n->devclass = devclass;
+	node_write_devclass(mesh, n);
+
 	n->connection = c;
 	c->node = n;
 	if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {
@@ -436,7 +446,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	c->allow_request = ALL;
 	c->status.active = true;
 
-	logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection with %s (%s) activated", c->name,
+	logger(mesh, MESHLINK_INFO, "Connection with %s (%s) activated", c->name,
 			   c->hostname);
 
 	/* Send him everything we know */
@@ -445,13 +455,15 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	/* Create an edge_t for this connection */
 
+	assert(devclass >= 0 && devclass <= _DEV_CLASS_MAX);
+
 	c->edge = new_edge();
 	c->edge->from = mesh->self;
 	c->edge->to = n;
 	sockaddr2str(&c->address, &hisaddress, NULL);
 	c->edge->address = str2sockaddr(hisaddress, hisport);
 	free(hisaddress);
-	c->edge->weight = (weight + c->estimated_weight) / 2;
+	c->edge->weight = dev_class_traits[devclass].edge_weight;
 	c->edge->connection = c;
 	c->edge->options = c->options;