Move assert()s that dereference a pointer to after the pointer NULL check.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 367ccd293857f98162b50ba4a8a4afda5f3be217..1b091db04034bd1a343390f508752d89de571b6a 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -46,6 +46,7 @@ static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config
        uint32_t version = packmsg_get_uint32(in);
 
        if(version != MESHLINK_CONFIG_VERSION) {
+               logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
                config_free(config);
                return false;
        }
@@ -54,6 +55,7 @@ static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config
        uint32_t len = packmsg_get_str_raw(in, &name);
 
        if(len != strlen(n->name) || !name || strncmp(name, n->name, len)) {
+               logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
                config_free(config);
                return false;
        }
@@ -61,43 +63,6 @@ static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config
        return true;
 }
 
-/// Read device class, blacklist status and submesh from a host config file. Used at startup when reading all host config files.
-bool node_read_partial(meshlink_handle_t *mesh, node_t *n) {
-       config_t config;
-       packmsg_input_t in;
-
-       if(!node_get_config(mesh, n, &config, &in)) {
-               return false;
-       }
-
-       char *submesh_name = packmsg_get_str_dup(&in);
-
-       if(!strcmp(submesh_name, CORE_MESH)) {
-               free(submesh_name);
-               n->submesh = NULL;
-       } else {
-               n->submesh = lookup_or_create_submesh(mesh, submesh_name);
-               free(submesh_name);
-
-               if(!n->submesh) {
-                       config_free(&config);
-                       return false;
-               }
-       }
-
-       dev_class_t devclass = packmsg_get_int32(&in);
-       bool blacklisted = packmsg_get_bool(&in);
-       config_free(&config);
-
-       if(!packmsg_input_ok(&in) || devclass < 0 || devclass >= DEV_CLASS_COUNT) {
-               return false;
-       }
-
-       n->devclass = devclass;
-       n->status.blacklisted = blacklisted;
-       return true;
-}
-
 /// Read the public key from a host config file. Used whenever we need to start an SPTPS session.
 bool node_read_public_key(meshlink_handle_t *mesh, node_t *n) {
        if(ecdsa_active(n->ecdsa)) {
@@ -135,7 +100,7 @@ bool node_read_public_key(meshlink_handle_t *mesh, node_t *n) {
        // 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++) {
+       for(uint32_t i = 0; i < MAX_RECENT; i++) {
                if(n->recent[i].sa.sa_family) {
                        known_count++;
                }
@@ -143,14 +108,24 @@ bool node_read_public_key(meshlink_handle_t *mesh, node_t *n) {
 
        uint32_t count = packmsg_get_array(&in);
 
-       if(count > 5 - known_count) {
-               count = 5 - known_count;
+       for(uint32_t i = 0; i < count; i++) {
+               if(i < MAX_RECENT - known_count) {
+                       n->recent[i + known_count] = packmsg_get_sockaddr(&in);
+               } else {
+                       packmsg_skip_element(&in);
+               }
        }
 
-       for(uint32_t i = 0; i < count; i++) {
-               n->recent[i + known_count] = packmsg_get_sockaddr(&in);
+       time_t last_reachable = packmsg_get_int64(&in);
+       time_t last_unreachable = packmsg_get_int64(&in);
+
+       if(!n->last_reachable) {
+               n->last_reachable = last_reachable;
        }
 
+       if(!n->last_unreachable) {
+               n->last_unreachable = last_unreachable;
+       }
 
        config_free(&config);
        return true;
@@ -205,25 +180,30 @@ bool node_read_from_config(meshlink_handle_t *mesh, node_t *n, const config_t *c
        const void *key;
        uint32_t len = packmsg_get_bin_raw(&in, &key);
 
-       if(len != 32) {
-               return false;
-       }
+       if(len) {
+               if(len != 32) {
+                       return false;
+               }
 
-       if(!ecdsa_active(n->ecdsa)) {
-               n->ecdsa = ecdsa_set_public_key(key);
+               if(!ecdsa_active(n->ecdsa)) {
+                       n->ecdsa = ecdsa_set_public_key(key);
+               }
        }
 
        n->canonical_address = packmsg_get_str_dup(&in);
        uint32_t count = packmsg_get_array(&in);
 
-       if(count > 5) {
-               count = 5;
-       }
-
        for(uint32_t i = 0; i < count; i++) {
-               n->recent[i] = packmsg_get_sockaddr(&in);
+               if(i < MAX_RECENT) {
+                       n->recent[i] = packmsg_get_sockaddr(&in);
+               } else {
+                       packmsg_skip_element(&in);
+               }
        }
 
+       n->last_reachable = packmsg_get_int64(&in);
+       n->last_unreachable = packmsg_get_int64(&in);
+
        return packmsg_done(&in);
 }
 
@@ -251,7 +231,7 @@ bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
 
        uint32_t count = 0;
 
-       for(uint32_t i = 0; i < 5; i++) {
+       for(uint32_t i = 0; i < MAX_RECENT; i++) {
                if(n->recent[i].sa.sa_family) {
                        count++;
                } else {
@@ -265,12 +245,22 @@ bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
                packmsg_add_sockaddr(&out, &n->recent[i]);
        }
 
+       packmsg_add_int64(&out, n->last_reachable);
+       packmsg_add_int64(&out, n->last_unreachable);
+
        if(!packmsg_output_ok(&out)) {
+               meshlink_errno = MESHLINK_EINTERNAL;
                return false;
        }
 
        config_t config = {buf, packmsg_output_size(&out, buf)};
-       return config_write(mesh, "current", n->name, &config, mesh->config_key);
+
+       if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
+               call_error_cb(mesh, MESHLINK_ESTORAGE);
+               return false;
+       }
+
+       return true;
 }
 
 static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
@@ -289,11 +279,23 @@ static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
        n = new_node();
        n->name = xstrdup(name);
 
-       if(!node_read_partial(mesh, n)) {
+       config_t config;
+       packmsg_input_t in;
+
+       if(!node_get_config(mesh, n, &config, &in)) {
                free_node(n);
-               return true;
+               return false;
+       }
+
+       if(!node_read_from_config(mesh, n, &config)) {
+               logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
+               config_free(&config);
+               free_node(n);
+               return false;
        }
 
+       config_free(&config);
+
        node_add(mesh, n);
 
        return true;
@@ -410,14 +412,12 @@ bool setup_myself(meshlink_handle_t *mesh) {
        /* Done */
 
        mesh->self->nexthop = mesh->self;
-       mesh->self->status.reachable = true;
-       mesh->self->last_state_change = mesh->loop.now.tv_sec;
 
        node_add(mesh, mesh->self);
 
-       graph(mesh);
-
-       config_scan_all(mesh, "current", "hosts", load_node, NULL);
+       if(!config_scan_all(mesh, "current", "hosts", load_node, NULL)) {
+               logger(mesh, MESHLINK_WARNING, "Could not scan all host config files");
+       }
 
        /* Open sockets */
 
@@ -449,6 +449,7 @@ bool setup_myself(meshlink_handle_t *mesh) {
        /* Done. */
 
        mesh->last_config_check = mesh->loop.now.tv_sec;
+       mesh->last_unreachable = mesh->loop.now.tv_sec;
 
        return true;
 }