Fix reachability queries for blacklisted nodes.

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index fdc6fed874460271a5fe810722871238a8352cc3..0bec2f8aaf831c2cfd663f36fb7c0f97a7155633 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -37,6 +37,7 @@
 #include "ed25519/sha512.h"
 #include "discovery.h"
 #include "devtools.h"
+#include "graph.h"
 
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
@@ -612,7 +613,7 @@ static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len
        }
 
        // Write host config files
-       while(count--) {
+       for(uint32_t i = 0; i < count; i++) {
                const void *data;
                uint32_t len = packmsg_get_bin_raw(&in, &data);
 
@@ -655,11 +656,24 @@ static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len
                        return false;
                }
 
-               node_add(mesh, n);
+               if(i == 0) {
+                       /* The first host config file is of the inviter itself;
+                        * remember the address we are currently using for the invitation connection.
+                        */
+                       sockaddr_t sa;
+                       socklen_t salen = sizeof(sa);
 
-               if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
+                       if(getpeername(mesh->sock, &sa.sa, &salen) == 0) {
+                               node_add_recent_address(mesh, n, &sa);
+                       }
+               }
+
+               if(!node_write_config(mesh, n)) {
+                       free_node(n);
                        return false;
                }
+
+               node_add(mesh, n);
        }
 
        /* Ensure the configuration directory metadata is on disk */
@@ -1514,8 +1528,9 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 
        pthread_cond_wait(&mesh->cond, &mesh->mutex);
        mesh->threadstarted = true;
-       mesh->self->last_reachable = time(NULL);
-       mesh->self->status.dirty = true;
+
+       // Ensure we are considered reachable
+       graph(mesh);
 
        pthread_mutex_unlock(&mesh->mutex);
        return true;
@@ -1530,11 +1545,6 @@ void meshlink_stop(meshlink_handle_t *mesh) {
        pthread_mutex_lock(&mesh->mutex);
        logger(mesh, MESHLINK_DEBUG, "meshlink_stop called\n");
 
-       if(mesh->self) {
-               mesh->self->last_unreachable = time(NULL);
-               mesh->self->status.dirty = true;
-       }
-
        // Shut down the main thread
        event_loop_stop(&mesh->loop);
 
@@ -1574,6 +1584,11 @@ void meshlink_stop(meshlink_handle_t *mesh) {
 
        exit_outgoings(mesh);
 
+       // Ensure we are considered unreachable
+       if(mesh->nodes) {
+               graph(mesh);
+       }
+
        // Try to write out any changed node config files, ignore errors at this point.
        if(mesh->nodes) {
                for splay_each(node_t, n, mesh->nodes) {
@@ -2130,6 +2145,31 @@ meshlink_submesh_t *meshlink_get_node_submesh(meshlink_handle_t *mesh, meshlink_
        return s;
 }
 
+bool meshlink_get_node_reachability(struct meshlink_handle *mesh, struct meshlink_node *node, time_t *last_reachable, time_t *last_unreachable) {
+       if(!mesh || !node) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
+       node_t *n = (node_t *)node;
+       bool reachable;
+
+       pthread_mutex_lock(&mesh->mutex);
+       reachable = n->status.reachable && !n->status.blacklisted;
+
+       if(last_reachable) {
+               *last_reachable = n->last_reachable;
+       }
+
+       if(last_unreachable) {
+               *last_unreachable = n->last_unreachable;
+       }
+
+       pthread_mutex_unlock(&mesh->mutex);
+
+       return reachable;
+}
+
 bool meshlink_sign(meshlink_handle_t *mesh, const void *data, size_t len, void *signature, size_t *siglen) {
        if(!mesh || !data || !len || !signature || !siglen) {
                meshlink_errno = MESHLINK_EINVAL;
@@ -2935,6 +2975,10 @@ static bool blacklist(meshlink_handle_t *mesh, node_t *n) {
        n->mtuprobes = 0;
        n->status.udp_confirmed = false;
 
+       if(n->status.reachable) {
+               n->last_unreachable = mesh->loop.now.tv_sec;
+       }
+
        /* Graph updates will suppress status updates for blacklisted nodes, so we need to
         * manually call the status callback if necessary.
         */
@@ -3006,6 +3050,7 @@ static bool whitelist(meshlink_handle_t *mesh, node_t *n) {
        n->status.blacklisted = false;
 
        if(n->status.reachable) {
+               n->last_reachable = mesh->loop.now.tv_sec;
                update_node_status(mesh, n);
        }
 
@@ -3794,6 +3839,22 @@ void meshlink_set_dev_class_timeouts(meshlink_handle_t *mesh, dev_class_t devcla
        pthread_mutex_unlock(&mesh->mutex);
 }
 
+void meshlink_set_dev_class_fast_retry_period(meshlink_handle_t *mesh, dev_class_t devclass, int fast_retry_period) {
+       if(!mesh || devclass < 0 || devclass >= DEV_CLASS_COUNT) {
+               meshlink_errno = EINVAL;
+               return;
+       }
+
+       if(fast_retry_period < 0) {
+               meshlink_errno = EINVAL;
+               return;
+       }
+
+       pthread_mutex_lock(&mesh->mutex);
+       mesh->dev_class_traits[devclass].fast_retry_period = fast_retry_period;
+       pthread_mutex_unlock(&mesh->mutex);
+}
+
 void handle_network_change(meshlink_handle_t *mesh, bool online) {
        (void)online;