Don't send UDP probes to tiny nodes.

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index ce999cba00aebe133d3bb41a36c1d5b1a298ff57..41c82d36cd0c3d050140a0a5db21224836566cc2 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -29,6 +29,7 @@
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
+#include "pmtu.h"
 #include "protocol.h"
 #include "sptps.h"
 #include "xalloc.h"
@@ -52,7 +53,9 @@ static const int default_interval = 60;
   - Check if we need to retry making an outgoing connection
 */
 void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) {
-       logger(mesh, MESHLINK_INFO, "Closing connection with %s", c->name);
+       if(c->status.active) {
+               logger(mesh, MESHLINK_INFO, "Closing connection with %s", c->name);
+       }
 
        if(c->node && c->node->connection == c) {
                if(c->status.active && mesh->meta_status_cb) {
@@ -126,6 +129,8 @@ static void timeout_handler(event_loop_t *loop, void *data) {
                        if(c->node->status.waitingforkey && c->node->last_req_key + pingtimeout < mesh->loop.now.tv_sec) {
                                send_req_key(mesh, c->node);
                        }
+
+                       keepalive(mesh, c->node, false);
                }
 
                if(c->status.active && c->last_key_renewal + 3600 < mesh->loop.now.tv_sec) {
@@ -159,6 +164,7 @@ static void timeout_handler(event_loop_t *loop, void *data) {
                        }
 
                        terminate_connection(mesh, c, c->status.active);
+                       continue;
                }
        }
 
@@ -620,11 +626,9 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 
        for splay_each(node_t, n, mesh->nodes) {
                if(n->status.dirty) {
-                       if(!node_write_config(mesh, n)) {
+                       if(!node_write_config(mesh, n, false)) {
                                logger(mesh, MESHLINK_DEBUG, "Could not update %s", n->name);
                        }
-
-                       n->status.dirty = false;
                }
 
                if(n->status.reachable && n->status.validkey && n->last_req_key + 3600 < mesh->loop.now.tv_sec) {
@@ -713,9 +717,11 @@ void retry(meshlink_handle_t *mesh) {
        }
 
        /* Kick the ping timeout handler */
-       timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) {
-               0, 0
-       });
+       if(mesh->pingtimer.cb) {
+               timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) {
+                       0, 0
+               });
+       }
 }
 
 /*
@@ -733,7 +739,7 @@ void main_loop(meshlink_handle_t *mesh) {
        mesh->datafromapp.signum = 0;
        signal_add(&mesh->loop, &mesh->datafromapp, meshlink_send_from_queue, mesh, mesh->datafromapp.signum);
 
-       if(!event_loop_run(&mesh->loop, &mesh->mutex)) {
+       if(!event_loop_run(&mesh->loop, mesh)) {
                logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
                call_error_cb(mesh, MESHLINK_ENETWORK);
        }