Merge branch 'master' into 1.1

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 1c267f6..23b3e7c 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -21,8 +21,6 @@
 
 #include "system.h"
 
-#include <openssl/rand.h>
-
 #include "utils.h"
 #include "splay_tree.h"
 #include "conf.h"
@@ -61,9 +59,9 @@ void purge(void) {
                        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) {
@@ -91,7 +89,8 @@ 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);
                }
        }
@@ -208,7 +207,7 @@ void handle_meta_connection_data(int fd, short events, void *data) {
                else {
                        ifdebug(CONNECTIONS) logger(LOG_DEBUG,
                                           "Error while connecting to %s (%s): %s",
-                                          c->name, c->hostname, strerror(result));
+                                          c->name, c->hostname, sockstrerror(result));
                        closesocket(c->socket);
                        do_outgoing_connection(c);
                        return;
@@ -307,12 +306,19 @@ int main_loop(void) {
 
        timeout_set(&timeout_event, timeout_handler, &timeout_event);
        event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
+
+#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(event_loop(0) < 0) {
                logger(LOG_ERR, "Error while waiting for input: %s", strerror(errno));