Add support for opening a MeshLink instance without permanent storage.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 905e442d6aed296a27d74c01dcedd320f23e60e2..4f2022b7e02de08868d336c7a6a6d3f7d3fbd5dc 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -128,19 +128,36 @@ bool node_read_public_key(meshlink_handle_t *mesh, node_t *n) {
        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 +172,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 +186,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 +196,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);
 }
 
@@ -228,37 +242,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 +376,7 @@ bool setup_myself(meshlink_handle_t *mesh) {
 
        graph(mesh);
 
-       load_all_nodes(mesh);
+       config_scan_all(mesh, load_node);
 
        /* Open sockets */