X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=3676e9cb6f47ac88ab36f3c90e9849db4aeaa4ba;hb=be83b0af60449c7b35d17d97f2e6dc12f611e831;hp=d26b0f651f3dde6c374a7dcd49784d998bb6efde;hpb=53522b1c11222273c7b41f72b374e759d13b2165;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index d26b0f65..3676e9cb 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -164,8 +164,18 @@ static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const
 	n->devclass = DEV_CLASS_UNKNOWN;
 	n->ecdsa = ecdsa_set_public_key(data);
 	n->submesh = c->submesh;
+
+	// Remember its current address
+	node_add_recent_address(mesh, n, &c->address);
+
+	if(!node_write_config(mesh, n) || !config_sync(mesh, "current")) {
+		logger(mesh, MESHLINK_ERROR, "Error writing configuration file for invited node %s!\n", c->name);
+		free_node(n);
+		return false;
+
+	}
+
 	node_add(mesh, n);
-	node_write_config(mesh, n);
 
 	logger(mesh, MESHLINK_INFO, "Key successfully received from %s", c->name);
 
@@ -205,7 +215,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 
 	config_t config;
 
-	if(!invitation_read(mesh, cookie, &config)) {
+	if(!invitation_read(mesh, "current", cookie, &config, mesh->config_key)) {
 		logger(mesh, MESHLINK_ERROR, "Error while trying to read invitation file\n");
 		return false;
 	}
@@ -238,6 +248,9 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 	// Send the node the contents of the invitation file
 	sptps_send_record(&c->sptps, 0, config.buf, config.len);
 
+	config_free(&config);
+	free(submesh_name);
+
 	c->status.invitation_used = true;
 
 	logger(mesh, MESHLINK_INFO, "Invitation %s successfully sent to %s", cookie, c->name);
@@ -245,6 +258,9 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 }
 
 bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	char name[MAX_STRING_SIZE];
 
 	if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
@@ -326,13 +342,11 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	}
 
 	if(n->status.blacklisted) {
-		logger(mesh, MESHLINK_EPEER, "Peer %s is blacklisted", c->name);
+		logger(mesh, MESHLINK_WARNING, "Peer %s is blacklisted", c->name);
 		return false;
 	}
 
-	node_read_public_key(mesh, n);
-
-	if(!ecdsa_active(n->ecdsa)) {
+	if(!node_read_public_key(mesh, n)) {
 		logger(mesh, MESHLINK_ERROR, "No key known for peer %s", c->name);
 
 		if(n->status.reachable && !n->status.waitingforkey) {
@@ -368,14 +382,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 }
 
 bool send_ack(meshlink_handle_t *mesh, connection_t *c) {
-
-	/* Check some options */
-
-	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
-		c->options |= OPTION_PMTU_DISCOVERY;
-	}
-
-	return send_request(mesh, c, NULL, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, (c->options & 0xffffff) | (PROT_MINOR << 24));
+	return send_request(mesh, c, NULL, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, OPTION_PMTU_DISCOVERY | (PROT_MINOR << 24));
 }
 
 static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
@@ -389,6 +396,9 @@ static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
 }
 
 bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	char hisport[MAX_STRING_SIZE];
 	int devclass;
 	uint32_t options;
@@ -399,7 +409,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		return false;
 	}
 
-	if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+	if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
 		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ACK", c->name, "devclass invalid");
 		return false;
 	}
@@ -427,27 +437,22 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 				n->connection->outgoing = NULL;
 			}
 
+			/* Remove the edge before terminating the connection, to prevent a graph update. */
+			edge_del(mesh, n->connection->edge);
+			n->connection->edge = NULL;
+
 			terminate_connection(mesh, n->connection, false);
-			/* Run graph algorithm to keep things in sync */
-			graph(mesh);
 		}
 	}
 
 	n->devclass = devclass;
 	n->status.dirty = true;
 
-	n->last_successfull_connection = time(NULL);
+	n->last_successfull_connection = mesh->loop.now.tv_sec;
 
 	n->connection = c;
 	c->node = n;
 
-	if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {
-		c->options &= ~OPTION_PMTU_DISCOVERY;
-		options &= ~OPTION_PMTU_DISCOVERY;
-	}
-
-	c->options |= options;
-
 	/* Activate this connection */
 
 	c->allow_request = ALL;
@@ -461,15 +466,14 @@ 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);
+	assert(devclass >= 0 && devclass < DEV_CLASS_COUNT);
 
 	c->edge = new_edge();
 	c->edge->from = mesh->self;
 	c->edge->to = n;
 	sockaddrcpy_setport(&c->edge->address, &c->address, atoi(hisport));
-	c->edge->weight = dev_class_traits[devclass].edge_weight;
+	c->edge->weight = mesh->dev_class_traits[devclass].edge_weight;
 	c->edge->connection = c;
-	c->edge->options = c->options;
 
 	edge_add(mesh, c->edge);