Close meta connection socket after cleaning up event structures.
[tinc] / src / net.c
index 5638e64..8df87d6 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,9 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2006      Scott Lamb <slamb@slamb.org>
+                 2011      Loïc Grenié <loic.grenie@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #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 "subnet.h"
 #include "xalloc.h"
 
+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;
 
-       cp();
-
-       ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
+       ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes");
 
        /* Remove all edges and subnets owned by unreachable nodes. */
 
@@ -59,15 +57,15 @@ static void purge(void)
                n = nnode->data;
 
                if(!n->status.reachable) {
-                       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
+                       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Purging node %s (%s)", n->name,
                                           n->hostname);
 
                        for(snode = n->subnet_tree->head; snode; snode = snext) {
                                snext = snode->next;
                                s = snode->data;
-                               if(!tunnelserver)
-                                       send_del_subnet(broadcast, s);
-                               subnet_del(n, s);
+                               send_del_subnet(broadcast, s);
+                               if(!strictsubnets)
+                                       subnet_del(n, s);
                        }
 
                        for(enode = n->edge_tree->head; enode; enode = enext) {
@@ -95,38 +93,13 @@ static void purge(void)
                                        break;
                        }
 
-                       if(!enode)
+                       if(!enode && (!strictsubnets || !n->subnet_tree->head))
+                               /* in strictsubnets mode do not delete nodes with subnets */
                                node_del(n);
                }
        }
 }
 
-/*
-  put all file descriptors into events
-  While we're at it, purge stuf that needs to be removed.
-*/
-static int build_fdset(void)
-{
-       avl_node_t *node, *next;
-       connection_t *c;
-       int i, max = 0;
-
-       cp();
-
-       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();
-               }
-       }
-
-       return 0;
-}
-
 /*
   Terminate a connection:
   - Close the socket
@@ -134,27 +107,15 @@ 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)
-{
-       cp();
-
-       if(c->status.remove)
-               return;
-
-       ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
+void terminate_connection(connection_t *c, bool report) {
+       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)
                c->node->connection = NULL;
 
-       if(c->socket)
-               closesocket(c->socket);
-
-       event_del(&c->ev);
-
        if(c->edge) {
                if(report && !tunnelserver)
                        send_del_edge(broadcast, c->edge);
@@ -180,16 +141,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);
 }
 
 /*
@@ -200,70 +155,73 @@ void terminate_connection(connection_t *c, bool report)
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void timeout_handler(int fd, short events, void *event)
-{
-       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);
 
-       cp();
-
        for(node = connection_tree->head; node; node = next) {
                next = node->next;
                c = node->data;
 
-               if(c->last_ping_time + pingtimeout < now) {
+               if(c->last_ping_time + pingtimeout <= now) {
                        if(c->status.active) {
                                if(c->status.pinged) {
-                                       ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"),
+                                       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);
-                               } else if(c->last_ping_time + pinginterval < now) {
+                                       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, c->status.value);
-                                       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(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!");
+                       event_loopexit(NULL);
+                       return;
+               }
+
+               contradicting_add_edge = 0;
+               contradicting_del_edge = 0;
+       }
+
        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);
-
-       if (c->status.remove)
-               return;
+       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, strerror(result));
-                       c->status.connecting = false;
+                                          "Error while connecting to %s (%s): %s",
+                                          c->name, c->hostname, sockstrerror(result));
                        closesocket(c->socket);
                        do_outgoing_connection(c);
                        return;
@@ -277,55 +235,27 @@ void handle_meta_connection_data(int fd, short events, void *data)
 }
 
 static void sigterm_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
        event_loopexit(NULL);
 }
 
-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;
-       }
-}
-
-static void sigusr1_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-       dump_connections();
-}
-
-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();
+static void sighup_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+       reopenlogger();
+       reload_configuration();
 }
 
-static void sigwinch_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-       purge();
+static void sigalrm_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+       retry();
 }
 
-static void sighup_handler(int signal, short events, void *data) {
+int reload_configuration(void) {
        connection_t *c;
-       avl_node_t *node;
+       splay_node_t *node, *next;
        char *fname;
        struct stat s;
        static time_t last_config_check = 0;
-       
-       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
 
        /* Reread our own configuration file */
 
@@ -333,15 +263,16 @@ static void sighup_handler(int signal, short events, void *data) {
        init_configuration(&config_tree);
 
        if(!read_server_config()) {
-               logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
+               logger(LOG_ERR, "Unable to reread configuration file, exitting.");
                event_loopexit(NULL);
-               return;
+               return EINVAL;
        }
 
        /* Close connections to hosts that have a changed or deleted host config file */
        
-       for(node = connection_tree->head; node; node = node->next) {
+       for(node = connection_tree->head; node; node = next) {
                c = node->data;
+               next = node->next;
                
                if(c->outgoing) {
                        free(c->outgoing->name);
@@ -351,7 +282,7 @@ static void sighup_handler(int signal, short events, void *data) {
                        c->outgoing = NULL;
                }
                
-               asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+               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);
@@ -359,16 +290,47 @@ static void sighup_handler(int signal, short events, void *data) {
 
        last_config_check = time(NULL);
 
+       /* If StrictSubnet is set, expire deleted Subnets and read new ones in */
+
+       if(strictsubnets) {
+               subnet_t *subnet;
+
+
+               for(node = subnet_tree->head; node; node = node->next) {
+                       subnet = node->data;
+                       subnet->expires = 1;
+               }
+
+               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);
+                       }
+               }
+       }
+
        /* 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));
+       return 0;
+}
 
+void retry(void) {
        connection_t *c;
-       avl_node_t *node;
+       splay_node_t *node;
 
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
@@ -387,54 +349,40 @@ static void sigalrm_handler(int signal, short events, void *data) {
 /*
   this is where it all happens...
 */
-int main_loop(void)
-{
-       struct timeval tv;
-       int r;
+int main_loop(void) {
        struct event timeout_event;
+
+       timeout_set(&timeout_event, timeout_handler, &timeout_event);
+       event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
+
+#ifndef HAVE_MINGW
        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;
 
-       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);
-       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);
+#endif
 
        if(event_loop(0) < 0) {
-               logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+               logger(LOG_ERR, "Error while waiting for input: %s", strerror(errno));
                return 1;
        }
 
+#ifndef HAVE_MINGW
        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);
+#endif
+
        event_del(&timeout_event);
 
        return 0;