Add meshlink_get_node_reachability().

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index c7c6723c27d3eef7e9e797e8c8991b551617b141..7c600534e3a682488200bbfa9f4cf320e7fe11f3 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -109,6 +109,8 @@ void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report)
   and close the connection.
 */
 static void timeout_handler(event_loop_t *loop, void *data) {
+       assert(data);
+
        meshlink_handle_t *mesh = loop->data;
        logger(mesh, MESHLINK_DEBUG, "timeout_handler()");
 
@@ -116,6 +118,10 @@ static void timeout_handler(event_loop_t *loop, void *data) {
                int pingtimeout = c->node ? mesh->dev_class_traits[c->node->devclass].pingtimeout : default_timeout;
                int pinginterval = c->node ? mesh->dev_class_traits[c->node->devclass].pinginterval : default_interval;
 
+               if(c->outgoing && c->outgoing->timeout < 5) {
+                       pingtimeout = 1;
+               }
+
                // Also make sure that if outstanding key requests for the UDP counterpart of a connection has timed out, we restart it.
                if(c->node) {
                        if(c->node->status.waitingforkey && c->node->last_req_key + pingtimeout <= mesh->loop.now.tv_sec) {
@@ -146,7 +152,7 @@ static void timeout_handler(event_loop_t *loop, void *data) {
        }
 
        timeout_set(&mesh->loop, data, &(struct timeval) {
-               default_timeout, rand() % 100000
+               1, prng(mesh, TIMER_FUDGE)
        });
 }
 
@@ -421,7 +427,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                logger(mesh, MESHLINK_DEBUG, "* could not find node for initial connect");
                        }
 
-                       splay_free_tree(nodes);
+                       splay_delete_tree(nodes);
                }
 
 
@@ -450,11 +456,11 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                                logger(mesh, MESHLINK_DEBUG, "* found better node");
                                                connect_to = (node_t *)nodes->head->data;
 
-                                               splay_free_tree(nodes);
+                                               splay_delete_tree(nodes);
                                                break;
                                        }
 
-                                       splay_free_tree(nodes);
+                                       splay_delete_tree(nodes);
                                } else {
                                        break;
                                }
@@ -484,7 +490,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                logger(mesh, MESHLINK_DEBUG, "* could not find nodes for partition healing");
                        }
 
-                       splay_free_tree(nodes);
+                       splay_delete_tree(nodes);
                }
 
 
@@ -546,7 +552,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                                disconnect_from = (node_t *)nodes->head->data;
                                        }
 
-                                       splay_free_tree(nodes);
+                                       splay_delete_tree(nodes);
                                        break;
                                }
                        }
@@ -577,7 +583,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                                logger(mesh, MESHLINK_DEBUG, "* no node we want to disconnect, even though we have too many connections");
                        }
 
-                       splay_free_tree(nodes);
+                       splay_delete_tree(nodes);
                }
 
 
@@ -602,13 +608,16 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 
        for splay_each(node_t, n, mesh->nodes) {
                if(n->status.dirty) {
-                       node_write_config(mesh, n);
+                       if(node_write_config(mesh, n)) {
+                               logger(mesh, MESHLINK_DEBUG, "Could not update %s", n->name);
+                       }
+
                        n->status.dirty = false;
                }
        }
 
        timeout_set(&mesh->loop, data, &(struct timeval) {
-               timeout, rand() % 100000
+               timeout, prng(mesh, TIMER_FUDGE)
        });
 }
 
@@ -694,9 +703,9 @@ void retry(meshlink_handle_t *mesh) {
 /*
   this is where it all happens...
 */
-int main_loop(meshlink_handle_t *mesh) {
+void main_loop(meshlink_handle_t *mesh) {
        timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval) {
-               default_timeout, rand() % 100000
+               1, prng(mesh, TIMER_FUDGE)
        });
        timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval) {
                0, 0
@@ -704,21 +713,14 @@ int main_loop(meshlink_handle_t *mesh) {
 
        //Add signal handler
        mesh->datafromapp.signum = 0;
-       signal_add(&(mesh->loop), &(mesh->datafromapp), (signal_cb_t)meshlink_send_from_queue, mesh, mesh->datafromapp.signum);
+       signal_add(&mesh->loop, &mesh->datafromapp, meshlink_send_from_queue, mesh, mesh->datafromapp.signum);
 
-       if(!event_loop_run(&mesh->loop, &mesh->mesh_mutex)) {
+       if(!event_loop_run(&mesh->loop, &mesh->mutex)) {
                logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
-               abort();
-               signal_del(&mesh->loop, &mesh->datafromapp);
-               timeout_del(&mesh->loop, &mesh->periodictimer);
-               timeout_del(&mesh->loop, &mesh->pingtimer);
-
-               return 1;
+               call_error_cb(mesh, MESHLINK_ENETWORK);
        }
 
        signal_del(&mesh->loop, &mesh->datafromapp);
        timeout_del(&mesh->loop, &mesh->periodictimer);
        timeout_del(&mesh->loop, &mesh->pingtimer);
-
-       return 0;
 }