Various fixes for the encrypted storage support.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 905e442d6aed296a27d74c01dcedd320f23e60e2..64088b3af1877f1fbf88d4d6826fb805c265cd90 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -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,8 +224,6 @@ 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);
 }
 
@@ -193,7 +235,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)) {
@@ -228,37 +269,26 @@ bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
        return config_write(mesh, n->name, &config);
 }
 
-void load_all_nodes(meshlink_handle_t *mesh) {
-       DIR *dir;
-       struct dirent *ent;
-       char dname[PATH_MAX];
-
-       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));
+static void load_node(meshlink_handle_t *mesh, const char *name) {
+       if(!check_id(name)) {
                return;
        }
 
-       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;
+       }
 
-               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;
        }
 
-       closedir(dir);
+       node_add(mesh, n);
 }
 
 /*
@@ -373,7 +403,7 @@ bool setup_myself(meshlink_handle_t *mesh) {
 
        graph(mesh);
 
-       load_all_nodes(mesh);
+       config_scan_all(mesh, load_node);
 
        /* Open sockets */
 
@@ -453,11 +483,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;
 }