K&R style braces
[tinc] / src / net.c
index 9156147..33d90da 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -29,7 +29,6 @@
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "tevent.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "route.h"
 #include "subnet.h"
 #include "xalloc.h"
 
-bool do_purge = false;
-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,20 +101,16 @@ static void purge(void)
 }
 
 /*
-  put all file descriptors in an fd_set array
-  While we're at it, purge stuff that needs to be removed.
+  put all file descriptors into events
+  While we're at it, purge stuf that needs to be removed.
 */
-static int build_fdset(fd_set *readset, fd_set *writeset)
-{
+static int build_fdset(void) {
        avl_node_t *node, *next;
        connection_t *c;
        int i, max = 0;
 
        cp();
 
-       FD_ZERO(readset);
-       FD_ZERO(writeset);
-
        for(node = connection_tree->head; node; node = next) {
                next = node->next;
                c = node->data;
@@ -131,29 +119,10 @@ static int build_fdset(fd_set *readset, fd_set *writeset)
                        connection_del(c);
                        if(!connection_tree->head)
                                purge();
-               } else {
-                       FD_SET(c->socket, readset);
-                       if(c->outbuflen > 0)
-                               FD_SET(c->socket, writeset);
-                       if(c->socket > max)
-                               max = c->socket;
                }
        }
 
-       for(i = 0; i < listen_sockets; i++) {
-               FD_SET(listen_socket[i].tcp, readset);
-               if(listen_socket[i].tcp > max)
-                       max = listen_socket[i].tcp;
-               FD_SET(listen_socket[i].udp, readset);
-               if(listen_socket[i].udp > max)
-                       max = listen_socket[i].udp;
-       }
-
-       FD_SET(device_fd, readset);
-       if(device_fd > max)
-               max = device_fd;
-       
-       return max;
+       return 0;
 }
 
 /*
@@ -163,8 +132,7 @@ static int build_fdset(fd_set *readset, fd_set *writeset)
   - 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)
@@ -182,6 +150,8 @@ void terminate_connection(connection_t *c, bool report)
        if(c->socket)
                closesocket(c->socket);
 
+       event_del(&c->ev);
+
        if(c->edge) {
                if(report && !tunnelserver)
                        send_del_edge(broadcast, c->edge);
@@ -227,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();
 
@@ -266,224 +236,200 @@ 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});
 }
 
-/*
-  check all connections to see if anything
-  happened on their sockets
-*/
-static void check_network_activity(fd_set * readset, fd_set * writeset)
-{
-       connection_t *c;
-       avl_node_t *node;
-       int result, i;
+void handle_meta_connection_data(int fd, short events, void *data) {
+       connection_t *c = data;
+       int result;
        socklen_t len = sizeof(result);
-       vpn_packet_t packet;
-
-       cp();
-
-       /* check input from kernel */
-       if(FD_ISSET(device_fd, readset)) {
-               if(read_packet(&packet))
-                       route(myself, &packet);
-       }
-
-       /* check meta connections */
-       for(node = connection_tree->head; node; node = node->next) {
-               c = node->data;
 
-               if(c->status.remove)
-                       continue;
-
-               if(FD_ISSET(c->socket, readset)) {
-                       if(c->status.connecting) {
-                               c->status.connecting = false;
-                               getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
-
-                               if(!result)
-                                       finish_connecting(c);
-                               else {
-                                       ifdebug(CONNECTIONS) logger(LOG_DEBUG,
-                                                          _("Error while connecting to %s (%s): %s"),
-                                                          c->name, c->hostname, strerror(result));
-                                       closesocket(c->socket);
-                                       do_outgoing_connection(c);
-                                       continue;
-                               }
-                       }
-
-                       if(!receive_meta(c)) {
-                               terminate_connection(c, c->status.active);
-                               continue;
-                       }
-               }
+       if (c->status.remove)
+               return;
 
-               if(FD_ISSET(c->socket, writeset)) {
-                       if(!flush_meta(c)) {
-                               terminate_connection(c, c->status.active);
-                               continue;
-                       }
+       if(c->status.connecting) {
+               getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+
+               if(!result)
+                       finish_connecting(c);
+               else {
+                       ifdebug(CONNECTIONS) logger(LOG_DEBUG,
+                                          _("Error while connecting to %s (%s): %s"),
+                                          c->name, c->hostname, strerror(result));
+                       c->status.connecting = false;
+                       closesocket(c->socket);
+                       do_outgoing_connection(c);
+                       return;
                }
        }
 
-       for(i = 0; i < listen_sockets; i++) {
-               if(FD_ISSET(listen_socket[i].udp, readset))
-                       handle_incoming_vpn_data(listen_socket[i].udp);
-
-               if(FD_ISSET(listen_socket[i].tcp, readset))
-                       handle_new_meta_connection(listen_socket[i].tcp);
+       if (!receive_meta(c)) {
+               terminate_connection(c, c->status.active);
+               return;
        }
 }
 
-/*
-  this is where it all happens...
-*/
-int main_loop(void)
-{
-       fd_set readset, writeset;
-       struct timeval tv;
-       int r, maxfd;
-       time_t last_ping_check, last_config_check, last_graph_dump;
-       tevent_t *event;
-
-       cp();
-
-       last_ping_check = now;
-       last_config_check = now;
-       last_graph_dump = now;
-       
-       srand(now);
+static void sigterm_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       event_loopexit(NULL);
+}
 
-       running = true;
+static void sigint_handler(int signal, short events, void *data) {
+       static int saved_debug_level = -1;
+
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+
+       if(saved_debug_level != -1) {
+               logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
+                       saved_debug_level);
+               debug_level = saved_debug_level;
+               saved_debug_level = -1;
+       } else {
+               logger(LOG_NOTICE,
+                       _("Temporarily setting debug level to 5.  Kill me with SIGINT again to go back to level %d."),
+                       debug_level);
+               saved_debug_level = debug_level;
+               debug_level = 5;
+       }
+}
 
-       while(running) {
-               now = time(NULL);
+static void sigusr1_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       dump_connections();
+}
 
-       //      tv.tv_sec = 1 + (rand() & 7);   /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
-               tv.tv_sec = 1;
-               tv.tv_usec = 0;
+static void sigusr2_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       dump_device_stats();
+       dump_nodes();
+       dump_edges();
+       dump_subnets();
+}
 
-               maxfd = build_fdset(&readset, &writeset);
+static void sigwinch_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       purge();
+}
 
-               r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
+static void sighup_handler(int signal, short events, void *data) {
+       connection_t *c;
+       avl_node_t *node;
+       char *fname;
+       struct stat s;
+       static time_t last_config_check = 0;
+       
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
 
-               if(r < 0) {
-                       if(errno != EINTR && errno != EAGAIN) {
-                               logger(LOG_ERR, _("Error while waiting for input: %s"),
-                                          strerror(errno));
-                               cp_trace();
-                               dump_connections();
-                               return 1;
-                       }
+       /* Reread our own configuration file */
 
-                       continue;
-               }
+       exit_configuration(&config_tree);
+       init_configuration(&config_tree);
 
-               check_network_activity(&readset, &writeset);
+       if(!read_server_config()) {
+               logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
+               event_loopexit(NULL);
+               return;
+       }
 
-               if(do_purge) {
-                       purge();
-                       do_purge = false;
+       /* Close connections to hosts that have a changed or deleted host config file */
+       
+       for(node = connection_tree->head; node; node = node->next) {
+               c = node->data;
+               
+               if(c->outgoing) {
+                       free(c->outgoing->name);
+                       if(c->outgoing->ai)
+                               freeaddrinfo(c->outgoing->ai);
+                       free(c->outgoing);
+                       c->outgoing = NULL;
                }
+               
+               asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+               if(stat(fname, &s) || s.st_mtime > last_config_check)
+                       terminate_connection(c, c->status.active);
+               free(fname);
+       }
 
-               /* Let's check if everybody is still alive */
-
-               if(last_ping_check + pingtimeout < now) {
-                       check_dead_connections();
-                       last_ping_check = now;
-
-                       if(routing_mode == RMODE_SWITCH)
-                               age_subnets();
-
-                       age_past_requests();
-
-                       /* Should we regenerate our key? */
-
-                       if(keyexpires < now) {
-                               ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
+       last_config_check = time(NULL);
 
-                               RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
-                               if(myself->cipher)
-                                       EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len);
-                               send_key_changed(broadcast, myself);
-                               keyexpires = now + keylifetime;
-                       }
-               }
+       /* Try to make outgoing connections */
+       
+       try_outgoing_connections();
+}
 
+static void sigalrm_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
 
-               while((event = get_expired_event())) {
-                       event->handler(event->data);
-                       free_event(event);
-               }
+       connection_t *c;
+       avl_node_t *node;
 
-               if(sigalrm) {
-                       logger(LOG_INFO, _("Flushing event queue"));
-                       flush_events();
-                       sigalrm = false;
+       for(node = connection_tree->head; node; node = node->next) {
+               c = node->data;
+               
+               if(c->outgoing && !c->node) {
+                       if(timeout_initialized(&c->outgoing->ev))
+                               event_del(&c->outgoing->ev);
+                       if(c->status.connecting)
+                               close(c->socket);
+                       c->outgoing->timeout = 0;
+                       do_outgoing_connection(c);
                }
+       }
+}
 
-               if(sighup) {
-                       connection_t *c;
-                       avl_node_t *node;
-                       char *fname;
-                       struct stat s;
-                       
-                       sighup = false;
-                       
-                       /* Reread our own configuration file */
-
-                       exit_configuration(&config_tree);
-                       init_configuration(&config_tree);
-
-                       if(!read_server_config()) {
-                               logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
-                               return 1;
-                       }
-
-                       /* Close connections to hosts that have a changed or deleted host config file */
-                       
-                       for(node = connection_tree->head; node; node = node->next) {
-                               c = node->data;
-                               
-                               if(c->outgoing) {
-                                       free(c->outgoing->name);
-                                       if(c->outgoing->ai)
-                                               freeaddrinfo(c->outgoing->ai);
-                                       free(c->outgoing);
-                                       c->outgoing = NULL;
-                               }
-                               
-                               asprintf(&fname, "%s/hosts/%s", confbase, c->name);
-                               if(stat(fname, &s) || s.st_mtime > last_config_check)
-                                       terminate_connection(c, c->status.active);
-                               free(fname);
-                       }
-
-                       last_config_check = now;
+/*
+  this is where it all happens...
+*/
+int main_loop(void) {
+       struct timeval tv;
+       int r;
+       struct event timeout_event;
+       struct event sighup_event;
+       struct event sigint_event;
+       struct event sigterm_event;
+       struct event sigquit_event;
+       struct event sigusr1_event;
+       struct event sigusr2_event;
+       struct event sigwinch_event;
+       struct event sigalrm_event;
 
-                       /* Try to make outgoing connections */
-                       
-                       try_outgoing_connections();
-               }
-               
-               /* Dump graph if wanted every 60 seconds*/
+       cp();
 
-               if(last_graph_dump + 60 < now) {
-                       dump_graph();
-                       last_graph_dump = now;
-               }
+       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);
+       signal_add(&sigint_event, NULL);
+       signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
+       signal_add(&sigterm_event, NULL);
+       signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
+       signal_add(&sigquit_event, NULL);
+       signal_set(&sigusr1_event, SIGUSR1, sigusr1_handler, NULL);
+       signal_add(&sigusr1_event, NULL);
+       signal_set(&sigusr2_event, SIGUSR2, sigusr2_handler, NULL);
+       signal_add(&sigusr2_event, NULL);
+       signal_set(&sigwinch_event, SIGWINCH, sigwinch_handler, NULL);
+       signal_add(&sigwinch_event, NULL);
+       signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
+       signal_add(&sigalrm_event, NULL);
+
+       if(event_loop(0) < 0) {
+               logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+               return 1;
        }
 
+       signal_del(&sighup_event);
+       signal_del(&sigint_event);
+       signal_del(&sigterm_event);
+       signal_del(&sigquit_event);
+       signal_del(&sigusr1_event);
+       signal_del(&sigusr2_event);
+       signal_del(&sigwinch_event);
+       signal_del(&sigalrm_event);
+       event_del(&timeout_event);
+
        return 0;
 }