Optimise handling of select() returning <= 0.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 3f17083..f24d18a 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -374,11 +374,10 @@ int main_loop(void) {
                                dump_connections();
                                return 1;
                        }
-
-                       continue;
                }
 
-               check_network_activity(&readset, &writeset);
+               if(r > 0)
+                       check_network_activity(&readset, &writeset);
 
                if(do_purge) {
                        purge();
@@ -418,8 +417,13 @@ int main_loop(void) {
                }
 
                if(sigalrm) {
+                       avl_node_t *node;
                        logger(LOG_INFO, "Flushing event queue");
                        expire_events();
+                       for(node = connection_tree->head; node; node = node->next) {
+                               connection_t *c = node->data;
+                               send_ping(c);
+                       }
                        sigalrm = false;
                }