Merge branch 'master' into 1.1
[oweals/tinc.git] / src / net.c
index 08e3cad3ee1bf03a950748209703c47cdc943b7e..7d44d17c378f0bbbf2821bd6b4432dd43f5d6705 100644 (file)
--- a/src/net.c
+++ b/src/net.c
 
 #include "system.h"
 
-#include <openssl/rand.h>
-
 #include "utils.h"
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "event.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;
 int contradicting_add_edge = 0;
 int contradicting_del_edge = 0;
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void) {
-       avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
+void purge(void) {
+       splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
        node_t *n;
        edge_t *e;
        subnet_t *s;
@@ -107,52 +99,6 @@ 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.
-*/
-static int build_fdset(fd_set *readset, fd_set *writeset) {
-       avl_node_t *node, *next;
-       connection_t *c;
-       int i, max = 0;
-
-       FD_ZERO(readset);
-       FD_ZERO(writeset);
-
-       for(node = connection_tree->head; node; node = next) {
-               next = node->next;
-               c = node->data;
-
-               if(c->status.remove) {
-                       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;
-       }
-
-       if(device_fd >= 0)
-               FD_SET(device_fd, readset);
-       if(device_fd > max)
-               max = device_fd;
-       
-       return max;
-}
-
 /*
   Terminate a connection:
   - Close the socket
@@ -161,13 +107,9 @@ static int build_fdset(fd_set *readset, fd_set *writeset) {
   - Deactivate the host
 */
 void terminate_connection(connection_t *c, bool report) {
-       if(c->status.remove)
-               return;
-
        ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Closing connection with %s (%s)",
                           c->name, c->hostname);
 
-       c->status.remove = true;
        c->status.active = false;
 
        if(c->node)
@@ -201,16 +143,10 @@ void terminate_connection(connection_t *c, bool report) {
 
        /* Check if this was our outgoing connection */
 
-       if(c->outgoing) {
+       if(c->outgoing)
                retry_outgoing(c->outgoing);
-               c->outgoing = NULL;
-       }
 
-       free(c->outbuf);
-       c->outbuf = NULL;
-       c->outbuflen = 0;
-       c->outbufsize = 0;
-       c->outbufstart = 0;
+       connection_del(c);
 }
 
 /*
@@ -221,9 +157,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) {
-       avl_node_t *node, *next;
+static void timeout_handler(int fd, short events, void *event) {
+       splay_node_t *node, *next;
        connection_t *c;
+       time_t now = time(NULL);
 
        for(node = connection_tree->head; node; node = next) {
                next = node->next;
@@ -234,327 +171,211 @@ static void check_dead_connections(void) {
                                if(c->status.pinged) {
                                        ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
                                                           c->name, c->hostname, now - c->last_ping_time);
-                                       c->status.timeout = true;
                                        terminate_connection(c, true);
+                                       continue;
                                } else if(c->last_ping_time + pinginterval < now) {
                                        send_ping(c);
                                }
                        } else {
-                               if(c->status.remove) {
-                                       logger(LOG_WARNING, "Old connection_t for %s (%s) status %04x still lingering, deleting...",
-                                                  c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status));
-                                       connection_del(c);
-                                       continue;
-                               }
-                               ifdebug(CONNECTIONS) logger(LOG_WARNING, "Timeout from %s (%s) during authentication",
-                                                  c->name, c->hostname);
                                if(c->status.connecting) {
+                                       ifdebug(CONNECTIONS)
+                                               logger(LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
                                        c->status.connecting = false;
                                        closesocket(c->socket);
                                        do_outgoing_connection(c);
                                } else {
+                                       ifdebug(CONNECTIONS) logger(LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
                                        terminate_connection(c, false);
+                                       continue;
                                }
                        }
                }
-
-               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);
-                       }
-               }
-       }
-}
-
-/*
-  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;
-       socklen_t len = sizeof(result);
-       vpn_packet_t packet;
-       static int errors = 0;
-
-       /* check input from kernel */
-       if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
-               if(read_packet(&packet)) {
-                       errors = 0;
-                       packet.priority = 0;
-                       route(myself, &packet);
-               } else {
-                       usleep(errors * 50000);
-                       errors++;
-                       if(errors > 10) {
-                               logger(LOG_ERR, "Too many errors from %s, exiting!", device);
-                               running = false;
-                       }
-               }
        }
 
-       /* check meta connections */
-       for(node = connection_tree->head; node; node = node->next) {
-               c = node->data;
+       if(contradicting_del_edge && contradicting_add_edge) {
+               logger(LOG_WARNING, "Possible node with same Name as us!");
 
-               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, (void *)&result, &len);
+               if(rand() % 3 == 0) {
+                       logger(LOG_ERR, "Shutting down, check configuration of all nodes for duplicate Names!");
+                       event_loopexit(NULL);
+                       return;
+               }
 
-                               if(!result)
-                                       finish_connecting(c);
-                               else {
-                                       ifdebug(CONNECTIONS) logger(LOG_DEBUG,
-                                                          "Error while connecting to %s (%s): %s",
-                                                          c->name, c->hostname, sockstrerror(result));
-                                       closesocket(c->socket);
-                                       do_outgoing_connection(c);
-                                       continue;
-                               }
-                       }
+               contradicting_add_edge = 0;
+               contradicting_del_edge = 0;
+       }
 
-                       if(!receive_meta(c)) {
-                               terminate_connection(c, c->status.active);
-                               continue;
-                       }
-               }
+       event_add(event, &(struct timeval){pingtimeout, 0});
+}
 
-               if(FD_ISSET(c->socket, writeset)) {
-                       if(!flush_meta(c)) {
-                               terminate_connection(c, c->status.active);
-                               continue;
-                       }
+void handle_meta_connection_data(int fd, short events, void *data) {
+       connection_t *c = data;
+       int result;
+       socklen_t len = sizeof result;
+
+       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, sockstrerror(result));
+                       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;
-       event_t *event;
-
-       last_ping_check = now;
-       last_config_check = now;
-       last_graph_dump = now;
-       
-       srand(now);
-
-       running = true;
+static void sigterm_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+       event_loopexit(NULL);
+}
 
-       while(running) {
-               now = time(NULL);
+static void sighup_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+       reload_configuration();
+}
 
-       //      tv.tv_sec = 1 + (rand() & 7);   /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
-               tv.tv_sec = 1;
-               tv.tv_usec = 0;
+int reload_configuration(void) {
+       connection_t *c;
+       splay_node_t *node, *next;
+       char *fname;
+       struct stat s;
+       static time_t last_config_check = 0;
 
-               maxfd = build_fdset(&readset, &writeset);
+       /* Reread our own configuration file */
 
-#ifdef HAVE_MINGW
-               LeaveCriticalSection(&mutex);
-#endif
-               r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
-#ifdef HAVE_MINGW
-               EnterCriticalSection(&mutex);
-#endif
+       exit_configuration(&config_tree);
+       init_configuration(&config_tree);
 
-               if(r < 0) {
-                       if(!sockwouldblock(sockerrno)) {
-                               logger(LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno));
-                               dump_connections();
-                               return 1;
-                       }
-               }
-
-               if(r > 0)
-                       check_network_activity(&readset, &writeset);
+       if(!read_server_config()) {
+               logger(LOG_ERR, "Unable to reread configuration file, exitting.");
+               event_loopexit(NULL);
+               return EINVAL;
+       }
 
-               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 = next) {
+               c = node->data;
+               next = node->next;
+               
+               if(c->outgoing) {
+                       free(c->outgoing->name);
+                       if(c->outgoing->ai)
+                               freeaddrinfo(c->outgoing->ai);
+                       free(c->outgoing);
+                       c->outgoing = NULL;
                }
+               
+               xasprintf(&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) {
-                               avl_node_t *node;
-                               node_t *n;
+       last_config_check = time(NULL);
 
-                               ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
+       /* If StrictSubnet is set, expire deleted Subnets and read new ones in */
 
-                               for(node = node_tree->head; node; node = node->next) {
-                                       n = node->data;
-                                       if(n->inkey) {
-                                               free(n->inkey);
-                                               n->inkey = NULL;
-                                       }
-                               }
+       if(strictsubnets) {
+               subnet_t *subnet;
 
-                               send_key_changed(broadcast, myself);
-                               keyexpires = now + keylifetime;
-                       }
 
-                       if(contradicting_del_edge && contradicting_add_edge) {
-                               logger(LOG_WARNING, "Possible node with same Name as us!");
-
-                               if(rand() % 3 == 0) {
-                                       logger(LOG_ERR, "Shutting down, check configuration of all nodes for duplicate Names!");
-                                       running = false;
-                                       break;
-                               }
-
-                               contradicting_add_edge = 0;
-                               contradicting_del_edge = 0;
-                       }
+               for(node = subnet_tree->head; node; node = node->next) {
+                       subnet = node->data;
+                       subnet->expires = 1;
                }
 
-               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);
+               load_all_subnets();
+
+               for(node = subnet_tree->head; node; node = next) {
+                       next = node->next;
+                       subnet = node->data;
+                       if(subnet->expires == 1) {
+                               send_del_subnet(broadcast, subnet);
+                               if(subnet->owner->status.reachable)
+                                       subnet_update(subnet->owner, subnet, false);
+                               subnet_del(subnet->owner, subnet);
+                       } else if(subnet->expires == -1) {
+                               subnet->expires = 0;
+                       } else {
+                               send_add_subnet(broadcast, subnet);
+                               if(subnet->owner->status.reachable)
+                                       subnet_update(subnet->owner, subnet, true);
                        }
-                       sigalrm = false;
-               }
-
-               while((event = get_expired_event())) {
-                       event->handler(event->data);
-                       free_event(event);
                }
+       }
 
-               if(sighup) {
-                       connection_t *c;
-                       avl_node_t *node, *next;
-                       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;
-                       }
-
-                       /* Cancel non-active outgoing connections */
-
-                       for(node = connection_tree->head; node; node = next) {
-                               next = node->next;
-                               c = node->data;
-
-                               c->outgoing = NULL;
-
-                               if(c->status.connecting) {
-                                       terminate_connection(c, false);
-                                       connection_del(c);
-                               }
-                       }
-
-                       /* Wipe list of outgoing connections */
-
-                       for(list_node_t *node = outgoing_list->head; node; node = node->next) {
-                               outgoing_t *outgoing = node->data;
-
-                               if(outgoing->event)
-                                       event_del(outgoing->event);
-                       }
-
-                       list_delete_list(outgoing_list);
-
-                       /* 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;
-                               
-                               xasprintf(&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);
-                       }
+       /* Try to make outgoing connections */
+       
+       try_outgoing_connections();
 
-                       last_config_check = now;
+       return 0;
+}
 
-                       /* If StrictSubnet is set, expire deleted Subnets and read new ones in */
+void retry(void) {
+       connection_t *c;
+       splay_node_t *node;
 
-                       if(strictsubnets) {
-                               subnet_t *subnet;
+       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);
+               }
+       }
+}
 
-                               for(node = subnet_tree->head; node; node = node->next) {
-                                       subnet = node->data;
-                                       subnet->expires = 1;
-                               }
+/*
+  this is where it all happens...
+*/
+int main_loop(void) {
+       struct event timeout_event;
+       struct event sighup_event;
+       struct event sigterm_event;
+       struct event sigquit_event;
 
-                               load_all_subnets();
-
-                               for(node = subnet_tree->head; node; node = next) {
-                                       next = node->next;
-                                       subnet = node->data;
-                                       if(subnet->expires == 1) {
-                                               send_del_subnet(broadcast, subnet);
-                                               if(subnet->owner->status.reachable)
-                                                       subnet_update(subnet->owner, subnet, false);
-                                               subnet_del(subnet->owner, subnet);
-                                       } else if(subnet->expires == -1) {
-                                               subnet->expires = 0;
-                                       } else {
-                                               send_add_subnet(broadcast, subnet);
-                                               if(subnet->owner->status.reachable)
-                                                       subnet_update(subnet->owner, subnet, true);
-                                       }
-                               }
-                       }
+       timeout_set(&timeout_event, timeout_handler, &timeout_event);
+       event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
 
-                       /* Try to make outgoing connections */
-                       
-                       try_outgoing_connections();
-               }
-               
-               /* Dump graph if wanted every 60 seconds*/
+#ifdef SIGHUP
+       signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
+       signal_add(&sighup_event, NULL);
+#endif
+#ifdef SIGTERM
+       signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
+       signal_add(&sigterm_event, NULL);
+#endif
+#ifdef SIGQUIT
+       signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
+       signal_add(&sigquit_event, NULL);
+#endif
 
-               if(last_graph_dump + 60 < now) {
-                       dump_graph();
-                       last_graph_dump = now;
-               }
+       if(event_loop(0) < 0) {
+               logger(LOG_ERR, "Error while waiting for input: %s", strerror(errno));
+               return 1;
        }
 
+       signal_del(&sighup_event);
+       signal_del(&sigterm_event);
+       signal_del(&sigquit_event);
+       event_del(&timeout_event);
+
        return 0;
 }