Allow tinc to handle unknown type addresses from other tinc daemons.

[tinc] / src / node.c

diff --git a/src/node.c b/src/node.c
index 0401144..f40fb19 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: node.c,v 1.1.2.24 2003/07/24 12:08:15 guus Exp $
+    $Id: node.c,v 1.1.2.27 2003/08/22 11:18:42 guus Exp $
 */
 
 #include "system.h"
@@ -58,7 +58,7 @@ void init_nodes(void)
 {
        cp();
 
-       node_tree = avl_alloc_tree((avl_compare_t) node_compare, NULL);
+       node_tree = avl_alloc_tree((avl_compare_t) node_compare, (avl_action_t) free_node);
        node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL);
 }
 
@@ -66,8 +66,8 @@ void exit_nodes(void)
 {
        cp();
 
-       avl_delete_tree(node_tree);
        avl_delete_tree(node_udp_tree);
+       avl_delete_tree(node_tree);
 }
 
 node_t *new_node(void)
@@ -106,6 +106,8 @@ void free_node(node_t *n)
        if(n->edge_tree)
                free_edge_tree(n->edge_tree);
 
+       sockaddrfree(&n->address);
+
        EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
        
        free(n);
@@ -143,26 +145,26 @@ void node_del(node_t *n)
        avl_delete(node_udp_tree, n);
 }
 
-node_t *lookup_node(const char *name)
+node_t *lookup_node(char *name)
 {
-       node_t n = {
-               .name = name,
-       };
+       node_t n = {0};
 
        cp();
        
+       n.name = name;
+
        return avl_search(node_tree, &n);
 }
 
 node_t *lookup_node_udp(const sockaddr_t *sa)
 {
-       node_t n = {
-               .address = *sa,
-               .name = NULL,
-       };
+       node_t n = {0};
 
        cp();
 
+       n.address = *sa;
+       n.name = NULL;
+
        return avl_search(node_udp_tree, &n);
 }
 
@@ -180,7 +182,7 @@ void dump_nodes(void)
                logger(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s"),
                           n->name, n->hostname, n->cipher ? n->cipher->nid : 0,
                           n->digest ? n->digest->type : 0, n->maclength, n->compression,
-                          n->options, n->status, n->nexthop ? n->nexthop->name : "-",
+                          n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
                           n->via ? n->via->name : "-");
        }