X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=f40fb19ed26a403b62ed619eba6cd09beb31171f;hp=5fb3d0d7b898d5b75d6885c410823e247e7742f7;hb=570e7e9c615388cfba263c7a7c66cbc3d092d6e7;hpb=714fb32d0377ed9f5643ed8f0bd914843d12266b

diff --git a/src/node.c b/src/node.c
index 5fb3d0d7..f40fb19e 100644
--- 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.25 2003/07/29 10:50: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);
@@ -145,24 +147,24 @@ void node_del(node_t *n)
 
 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);
 }