Use bind() to check if a local address is still valid.

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index b5705a471b198dde06bed1792d0208a835490a1d..304c62683b4e5faa2c50a3f675ad47051258ee57 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -40,6 +40,7 @@ static inline int min(int a, int b) {
 #endif
 
 static const int default_timeout = 5;
+static const int default_interval = 60;
 
 /*
   Terminate a connection:
@@ -108,11 +109,18 @@ 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()");
 
        for list_each(connection_t, c, mesh->connections) {
                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) {
@@ -125,7 +133,7 @@ static void timeout_handler(event_loop_t *loop, void *data) {
                        if(c->status.active) {
                                if(c->status.pinged) {
                                        logger(mesh, MESHLINK_INFO, "%s didn't respond to PING in %ld seconds", c->name, (long)mesh->loop.now.tv_sec - c->last_ping_time);
-                               } else if(c->last_ping_time + mesh->dev_class_traits[c->node->devclass].pinginterval <= mesh->loop.now.tv_sec) {
+                               } else if(c->last_ping_time + pinginterval <= mesh->loop.now.tv_sec) {
                                        send_ping(mesh, c);
                                        continue;
                                } else {
@@ -144,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)
        });
 }
 
@@ -419,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);
                }
 
 
@@ -448,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;
                                }
@@ -482,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);
                }
 
 
@@ -544,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;
                                }
                        }
@@ -575,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);
                }
 
 
@@ -600,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)
        });
 }
 
@@ -628,11 +639,6 @@ void retry(meshlink_handle_t *mesh) {
                });
        }
 
-#ifdef HAVE_IFADDRS_H
-       struct ifaddrs *ifa = NULL;
-       getifaddrs(&ifa);
-#endif
-
        /* For active connections, check if their addresses are still valid.
         * If yes, reset their ping timers, otherwise terminate them. */
        for list_each(connection_t, c, mesh->connections) {
@@ -644,12 +650,6 @@ void retry(meshlink_handle_t *mesh) {
                        c->last_ping_time = 0;
                }
 
-#ifdef HAVE_IFADDRS_H
-
-               if(!ifa) {
-                       continue;
-               }
-
                sockaddr_t sa;
                socklen_t salen = sizeof(sa);
 
@@ -657,32 +657,33 @@ void retry(meshlink_handle_t *mesh) {
                        continue;
                }
 
-               bool found = false;
+               switch(sa.sa.sa_family) {
+               case AF_INET:
+                       sa.in.sin_port = 0;
+                       break;
 
-               for(struct ifaddrs *ifap = ifa; ifap; ifap = ifap->ifa_next) {
-                       if(ifap->ifa_addr && !sockaddrcmp_noport(&sa, (sockaddr_t *)ifap->ifa_addr)) {
-                               found = true;
-                               break;
-                       }
+               case AF_INET6:
+                       sa.in6.sin6_port = 0;
+                       break;
 
+               default:
+                       continue;
                }
 
-               if(!found) {
+               int sock = socket(sa.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+
+               if(sock != -1) {
+                       continue;
+               }
+
+               if(bind(sock, &sa.sa, salen) && errno == EADDRNOTAVAIL) {
                        logger(mesh, MESHLINK_DEBUG, "Local address for connection to %s no longer valid, terminating", c->name);
                        terminate_connection(mesh, c, c->status.active);
                }
 
-#endif
-       }
-
-#ifdef HAVE_IFADDRS_H
-
-       if(ifa) {
-               freeifaddrs(ifa);
+               closesocket(sock);
        }
 
-#endif
-
        /* Kick the ping timeout handler */
        timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timeval) {
                0, 0
@@ -692,9 +693,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
@@ -702,19 +703,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();
-               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;
 }