Modify meshlink configuration base file structre

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 4f2022b7e02de08868d336c7a6a6d3f7d3fbd5dc..52f5e820ffcf8c40e884e5f9c9cf9190f6a91fa2 100644 (file)
--- 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,6 +124,34 @@ 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;
 }
@@ -200,6 +228,10 @@ bool node_read_from_config(meshlink_handle_t *mesh, node_t *n, const config_t *c
 }
 
 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)};
 
@@ -207,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)) {
@@ -239,18 +270,20 @@ 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);
 }
 
-static void load_node(meshlink_handle_t *mesh, const char *name) {
+static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
+       (void)priv;
+
        if(!check_id(name)) {
-               return;
+               return true;
        }
 
        node_t *n = lookup_node(mesh, name);
 
        if(n) {
-               return;
+               return true;
        }
 
        n = new_node();
@@ -258,10 +291,12 @@ static void load_node(meshlink_handle_t *mesh, const char *name) {
 
        if(!node_read_partial(mesh, n)) {
                free_node(n);
-               return;
+               return true;
        }
 
        node_add(mesh, n);
+
+       return true;
 }
 
 /*
@@ -376,7 +411,7 @@ bool setup_myself(meshlink_handle_t *mesh) {
 
        graph(mesh);
 
-       config_scan_all(mesh, load_node);
+       config_scan_all(mesh, "current", "hosts", load_node, NULL);
 
        /* Open sockets */
 
@@ -456,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;
 }