Forget addresses of unreachable nodes.

[oweals/tinc.git] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 2b177c1398bdd175c3d1966f9c70f66a4eebec3e..cbf631f5f211b61ccc545e3676c097a0484689be 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -2,6 +2,7 @@
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
                   2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2006      Scott Lamb <slamb@slamb.org>
 
     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
@@ -351,14 +352,14 @@ bool setup_myself(void) {
                        }
                }
        } else
-               myself->incipher = EVP_aes_256_cbc();
+               myself->incipher = EVP_bf_cbc();
 
        if(myself->incipher)
                myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
        else
                myself->inkeylength = 1;
 
-       myself->connection->outcipher = EVP_aes_256_ofb();
+       myself->connection->outcipher = EVP_bf_ofb();
 
        if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
                keylifetime = 3600;
@@ -379,9 +380,9 @@ bool setup_myself(void) {
                        }
                }
        } else
-               myself->indigest = EVP_sha256();
+               myself->indigest = EVP_sha1();
 
-       myself->connection->outdigest = EVP_sha256();
+       myself->connection->outdigest = EVP_sha1();
 
        if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->inmaclength)) {
                if(myself->indigest) {
@@ -540,10 +541,17 @@ void close_network_connections(void) {
        for(node = connection_tree->head; node; node = next) {
                next = node->next;
                c = node->data;
-               c->outgoing = false;
+               c->outgoing = NULL;
                terminate_connection(c, false);
        }
 
+       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);
 
        if(myself && myself->connection) {