K&R style braces

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index df5fae7..33d90da 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -39,14 +39,9 @@
 #include "subnet.h"
 #include "xalloc.h"
 
-volatile bool running = false;
-
-time_t now = 0;
-
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void)
-{
+static void purge(void) {
        avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
        node_t *n;
        edge_t *e;
@@ -109,8 +104,7 @@ static void purge(void)
   put all file descriptors into events
   While we're at it, purge stuf that needs to be removed.
 */
-static int build_fdset(void)
-{
+static int build_fdset(void) {
        avl_node_t *node, *next;
        connection_t *c;
        int i, max = 0;
@@ -138,8 +132,7 @@ static int build_fdset(void)
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t *c, bool report)
-{
+void terminate_connection(connection_t *c, bool report) {
        cp();
 
        if(c->status.remove)
@@ -204,10 +197,10 @@ void terminate_connection(connection_t *c, bool report)
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void check_dead_connections(void)
-{
+static void timeout_handler(int fd, short events, void *event) {
        avl_node_t *node, *next;
        connection_t *c;
+       time_t now = time(NULL);
 
        cp();
 
@@ -243,21 +236,12 @@ static void check_dead_connections(void)
                                }
                        }
                }
-
-               if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
-                       if(c->status.active) {
-                               ifdebug(CONNECTIONS) logger(LOG_INFO,
-                                               _("%s (%s) could not flush for %ld seconds (%d bytes remaining)"),
-                                               c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
-                               c->status.timeout = true;
-                               terminate_connection(c, true);
-                       }
-               }
        }
+
+       event_add(event, &(struct timeval){pingtimeout, 0});
 }
 
-void handle_meta_connection_data(int fd, short events, void *data)
-{
+void handle_meta_connection_data(int fd, short events, void *data) {
        connection_t *c = data;
        int result;
        socklen_t len = sizeof(result);
@@ -287,13 +271,8 @@ void handle_meta_connection_data(int fd, short events, void *data)
        }
 }
 
-static void dummy(int a, short b, void *c)
-{
-}
-
 static void sigterm_handler(int signal, short events, void *data) {
        logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-       running = false;
        event_loopexit(NULL);
 }
 
@@ -403,12 +382,10 @@ static void sigalrm_handler(int signal, short events, void *data) {
 /*
   this is where it all happens...
 */
-int main_loop(void)
-{
+int main_loop(void) {
        struct timeval tv;
        int r;
-       time_t last_ping_check;
-       struct event timeout;
+       struct event timeout_event;
        struct event sighup_event;
        struct event sigint_event;
        struct event sigterm_event;
@@ -420,6 +397,8 @@ int main_loop(void)
 
        cp();
 
+       timeout_set(&timeout_event, timeout_handler, &timeout_event);
+       event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
        signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
        signal_add(&sighup_event, NULL);
        signal_set(&sigint_event, SIGINT, sigint_handler, NULL);
@@ -437,50 +416,9 @@ int main_loop(void)
        signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
        signal_add(&sigalrm_event, NULL);
 
-       last_ping_check = now;
-       
-       srand(now);
-
-       running = true;
-
-       while(running) {
-               now = time(NULL);
-
-       //      tv.tv_sec = 1 + (rand() & 7);   /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
-               tv.tv_sec = 1;
-               tv.tv_usec = 0;
-
-               /* XXX: libevent transition: old timeout code in this loop */
-               timeout_set(&timeout, dummy, NULL);
-               timeout_add(&timeout, &tv);
-
-               r = build_fdset();
-               if(r < 0) {
-                       logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno));
-                       cp_trace();
-                       dump_connections();
-                       return 1;
-               }
-
-               r = event_loop(EVLOOP_ONCE);
-               now = time(NULL);
-               if(r < 0) {
-                       logger(LOG_ERR, _("Error while waiting for input: %s"),
-                                  strerror(errno));
-                       cp_trace();
-                       dump_connections();
-                       return 1;
-               }
-
-               /* XXX: more libevent transition */
-               timeout_del(&timeout);
-
-               /* Let's check if everybody is still alive */
-
-               if(last_ping_check + pingtimeout < now) {
-                       check_dead_connections();
-                       last_ping_check = now;
-               }
+       if(event_loop(0) < 0) {
+               logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+               return 1;
        }
 
        signal_del(&sighup_event);
@@ -491,6 +429,7 @@ int main_loop(void)
        signal_del(&sigusr2_event);
        signal_del(&sigwinch_event);
        signal_del(&sigalrm_event);
+       event_del(&timeout_event);
 
        return 0;
 }