X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=0fdc1dcc1c1528f5951539d6fd2e433e51f86a6b;hp=350d02d8440b612609df2afe41d9f146a30a4ddf;hb=ad39db95fecf760297b4e320ef2f6d6d9fdad605;hpb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93

diff --git a/src/node.c b/src/node.c
index 350d02d8..0fdc1dcc 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,7 +1,7 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2002 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
+                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
 
     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
@@ -17,35 +17,30 @@
     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.21 2003/07/06 23:16:28 guus Exp $
+    $Id: node.c,v 1.1.2.28 2003/08/28 21:05:10 guus Exp $
 */
 
-#include "config.h"
-
-#include <string.h>
+#include "system.h"
 
-#include <avl_tree.h>
-#include "node.h"
-#include "netutl.h"
-#include "net.h"
+#include "avl_tree.h"
 #include "logger.h"
-
-#include <utils.h>
-#include <xalloc.h>
-
-#include "system.h"
+#include "net.h"
+#include "netutl.h"
+#include "node.h"
+#include "utils.h"
+#include "xalloc.h"
 
 avl_tree_t *node_tree;			/* Known nodes, sorted by name */
 avl_tree_t *node_udp_tree;		/* Known nodes, sorted by address and port */
 
 node_t *myself;
 
-static int node_compare(node_t *a, node_t *b)
+static int node_compare(const node_t *a, const node_t *b)
 {
 	return strcmp(a->name, b->name);
 }
 
-static int node_udp_compare(node_t *a, node_t *b)
+static int node_udp_compare(const node_t *a, const node_t *b)
 {
 	int result;
 
@@ -63,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);
 }
 
@@ -71,13 +66,13 @@ 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)
 {
-	node_t *n = (node_t *) xmalloc_and_zero(sizeof(*n));
+	node_t *n = xmalloc_and_zero(sizeof(*n));
 
 	cp();
 
@@ -111,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);
@@ -134,13 +131,13 @@ void node_del(node_t *n)
 
 	for(node = n->subnet_tree->head; node; node = next) {
 		next = node->next;
-		s = (subnet_t *) node->data;
+		s = node->data;
 		subnet_del(n, s);
 	}
 
 	for(node = n->edge_tree->head; node; node = next) {
 		next = node->next;
-		e = (edge_t *) node->data;
+		e = node->data;
 		edge_del(e);
 	}
 
@@ -150,16 +147,21 @@ void node_del(node_t *n)
 
 node_t *lookup_node(char *name)
 {
-	node_t n;
+	node_t n = {0};
+
 	cp();
+	
 	n.name = name;
+
 	return avl_search(node_tree, &n);
 }
 
-node_t *lookup_node_udp(sockaddr_t *sa)
+node_t *lookup_node_udp(const sockaddr_t *sa)
 {
-	node_t n;
+	node_t n = {0};
+
 	cp();
+
 	n.address = *sa;
 	n.name = NULL;
 
@@ -173,16 +175,16 @@ void dump_nodes(void)
 
 	cp();
 
-	logger(DEBUG_ALWAYS, LOG_DEBUG, _("Nodes:"));
+	logger(LOG_DEBUG, _("Nodes:"));
 
 	for(node = node_tree->head; node; node = node->next) {
-		n = (node_t *) node->data;
-		logger(DEBUG_ALWAYS, LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s"),
+		n = node->data;
+		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 : "-");
 	}
 
-	logger(DEBUG_ALWAYS, LOG_DEBUG, _("End of nodes."));
+	logger(LOG_DEBUG, _("End of nodes."));
 }