X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=52f5e820ffcf8c40e884e5f9c9cf9190f6a91fa2;hb=1442d234fb6681e32b10348a6c7b226c11629203;hp=905e442d6aed296a27d74c01dcedd320f23e60e2;hpb=fa05f996c5500c056a36c1d43e33a407f876643c;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 905e442d..52f5e820 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -36,7 +36,7 @@
 
 /// Helper function to start parsing a host config file
 static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config, packmsg_input_t *in) {
-	if(!config_read(mesh, n->name, config)) {
+	if(!config_read(mesh, "current", n->name, config, mesh->config_key)) {
 		return false;
 	}
 
@@ -124,23 +124,68 @@ bool node_read_public_key(meshlink_handle_t *mesh, node_t *n) {
 	}
 
 	n->ecdsa = ecdsa_set_public_key(key);
+
+	// While we are at it, read known address information
+	if(!n->canonical_address) {
+		n->canonical_address = packmsg_get_str_dup(&in);
+	} else {
+		packmsg_skip_element(&in);
+	}
+
+	// Append any known addresses in the config file to the list we currently have
+	uint32_t known_count = 0;
+
+	for(uint32_t i = 0; i < 5; i++) {
+		if(n->recent[i].sa.sa_family) {
+			known_count++;
+		}
+	}
+
+	uint32_t count = packmsg_get_array(&in);
+
+	if(count > 5 - known_count) {
+		count = 5 - known_count;
+	}
+
+	for(uint32_t i = 0; i < count; i++) {
+		n->recent[i + known_count] = packmsg_get_sockaddr(&in);
+	}
+
+
 	config_free(&config);
 	return true;
 }
 
-/// Read the full host config file. Used whenever we need to start an SPTPS session.
-bool node_read_full(meshlink_handle_t *mesh, node_t *n) {
+/// Fill in node details from a config blob.
+bool node_read_from_config(meshlink_handle_t *mesh, node_t *n, const config_t *config) {
 	if(n->canonical_address) {
 		return true;
 	}
 
-	config_t config;
-	packmsg_input_t in;
+	packmsg_input_t in = {config->buf, config->len};
+	uint32_t version = packmsg_get_uint32(&in);
 
-	if(!node_get_config(mesh, n, &config, &in)) {
+	if(version != MESHLINK_CONFIG_VERSION) {
+		return false;
+	}
+
+	char *name = packmsg_get_str_dup(&in);
+
+	if(!name) {
 		return false;
 	}
 
+	if(n->name) {
+		if(strcmp(n->name, name)) {
+			free(name);
+			return false;
+		}
+
+		free(name);
+	} else {
+		n->name = name;
+	}
+
 	char *submesh_name = packmsg_get_str_dup(&in);
 
 	if(!strcmp(submesh_name, CORE_MESH)) {
@@ -155,10 +200,10 @@ bool node_read_full(meshlink_handle_t *mesh, node_t *n) {
 		}
 	}
 
-	packmsg_get_int32(&in); /* devclass */
-	packmsg_get_bool(&in); /* blacklisted */
+	n->devclass = packmsg_get_int32(&in);
+	n->status.blacklisted = packmsg_get_bool(&in);
 	const void *key;
-	uint32_t len = packmsg_get_bin_raw(&in, &key); /* public key */
+	uint32_t len = packmsg_get_bin_raw(&in, &key);
 
 	if(len != 32) {
 		return false;
@@ -169,7 +214,6 @@ bool node_read_full(meshlink_handle_t *mesh, node_t *n) {
 	}
 
 	n->canonical_address = packmsg_get_str_dup(&in);
-
 	uint32_t count = packmsg_get_array(&in);
 
 	if(count > 5) {
@@ -180,12 +224,14 @@ bool node_read_full(meshlink_handle_t *mesh, node_t *n) {
 		n->recent[i] = packmsg_get_sockaddr(&in);
 	}
 
-	config_free(&config);
-
 	return packmsg_done(&in);
 }
 
 bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
+	if(!mesh->confbase) {
+		return true;
+	}
+
 	uint8_t buf[4096];
 	packmsg_output_t out = {buf, sizeof(buf)};
 
@@ -193,7 +239,6 @@ bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
 	packmsg_add_str(&out, n->name);
 	packmsg_add_str(&out, n->submesh ? n->submesh->name : CORE_MESH);
 	packmsg_add_int32(&out, n->devclass);
-	assert(n->devclass != 3);
 	packmsg_add_bool(&out, n->status.blacklisted);
 
 	if(ecdsa_active(n->ecdsa)) {
@@ -225,40 +270,33 @@ bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
 	}
 
 	config_t config = {buf, packmsg_output_size(&out, buf)};
-	return config_write(mesh, n->name, &config);
+	return config_write(mesh, "current", n->name, &config, mesh->config_key);
 }
 
-void load_all_nodes(meshlink_handle_t *mesh) {
-	DIR *dir;
-	struct dirent *ent;
-	char dname[PATH_MAX];
+static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
+	(void)priv;
 
-	snprintf(dname, PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
-	dir = opendir(dname);
-
-	if(!dir) {
-		logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
-		return;
+	if(!check_id(name)) {
+		return true;
 	}
 
-	while((ent = readdir(dir))) {
-		if(!check_id(ent->d_name)) {
-			continue;
-		}
+	node_t *n = lookup_node(mesh, name);
 
-		node_t *n = lookup_node(mesh, ent->d_name);
+	if(n) {
+		return true;
+	}
 
-		if(n) {
-			continue;
-		}
+	n = new_node();
+	n->name = xstrdup(name);
 
-		n = new_node();
-		n->name = xstrdup(ent->d_name);
-		node_read_partial(mesh, n);
-		node_add(mesh, n);
+	if(!node_read_partial(mesh, n)) {
+		free_node(n);
+		return true;
 	}
 
-	closedir(dir);
+	node_add(mesh, n);
+
+	return true;
 }
 
 /*
@@ -373,7 +411,7 @@ bool setup_myself(meshlink_handle_t *mesh) {
 
 	graph(mesh);
 
-	load_all_nodes(mesh);
+	config_scan_all(mesh, "current", "hosts", load_node, NULL);
 
 	/* Open sockets */
 
@@ -453,11 +491,13 @@ void close_network_connections(meshlink_handle_t *mesh) {
 	exit_requests(mesh);
 	exit_edges(mesh);
 	exit_nodes(mesh);
+	exit_submeshes(mesh);
 	exit_connections(mesh);
 
-	if(mesh->myport) {
-		free(mesh->myport);
-	}
+	free(mesh->myport);
+	mesh->myport = NULL;
+
+	mesh->self = NULL;
 
 	return;
 }