X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=debc91552ef8b31e8d546b72dc1abe91a657149a;hb=90f1cba1fd9e748ec4b8274511d5a36ec1a24d9d;hp=7e6dd8e648b31f99231baee41ac201180aee20c1;hpb=79e9a4f743b7b59fed968575f6b36171cf4a0063;p=tinc

diff --git a/src/node.c b/src/node.c
index 7e6dd8e6..debc9155 100644
--- a/src/node.c
+++ b/src/node.c
@@ -21,16 +21,17 @@
 #include "system.h"
 
 #include "control_common.h"
-#include "splay_tree.h"
+#include "hash.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
+#include "splay_tree.h"
 #include "utils.h"
 #include "xalloc.h"
 
 splay_tree_t *node_tree;			/* Known nodes, sorted by name */
-splay_tree_t *node_udp_tree;		/* Known nodes, sorted by address and port */
+static hash_t *node_udp_cache;
 
 node_t *myself;
 
@@ -38,24 +39,13 @@ static int node_compare(const node_t *a, const node_t *b) {
 	return strcmp(a->name, b->name);
 }
 
-static int node_udp_compare(const node_t *a, const node_t *b) {
-	int result;
-
-	result = sockaddrcmp(&a->address, &b->address);
-
-	if(result)
-		return result;
-
-	return (a->name && b->name) ? strcmp(a->name, b->name) : 0;
-}
-
 void init_nodes(void) {
 	node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
-	node_udp_tree = splay_alloc_tree((splay_compare_t) node_udp_compare, NULL);
+	node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
 }
 
 void exit_nodes(void) {
-	splay_delete_tree(node_udp_tree);
+	hash_free(node_udp_cache);
 	splay_delete_tree(node_tree);
 }
 
@@ -85,6 +75,9 @@ void free_node(node_t *n) {
 	cipher_close(&n->outcipher);
 	digest_close(&n->outdigest);
 
+	ecdsa_free(&n->ecdsa);
+	sptps_stop(&n->sptps);
+
 	if(timeout_initialized(&n->mtuevent))
 		event_del(&n->mtuevent);
 	
@@ -121,7 +114,6 @@ void node_del(node_t *n) {
 		edge_del(e);
 	}
 
-	splay_delete(node_udp_tree, n);
 	splay_delete(node_tree, n);
 }
 
@@ -134,34 +126,29 @@ node_t *lookup_node(char *name) {
 }
 
 node_t *lookup_node_udp(const sockaddr_t *sa) {
-	node_t n = {NULL};
-
-	n.address = *sa;
-	n.name = NULL;
-
-	return splay_search(node_udp_tree, &n);
+	return hash_search(node_udp_cache, sa);
 }
 
 void update_node_udp(node_t *n, const sockaddr_t *sa) {
 	if(n == myself) {
-		logger(LOG_WARNING, "Trying to update UDP address of myself!");
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Trying to update UDP address of myself!");
 		return;
 	}
 
-	splay_delete(node_udp_tree, n);
-
 	if(n->hostname)
 		free(n->hostname);
 
+	hash_insert(node_udp_cache, &n->address, NULL);
+
 	if(sa) {
 		n->address = *sa;
+		hash_insert(node_udp_cache, sa, n);
 		n->hostname = sockaddr2hostname(&n->address);
-		splay_insert(node_udp_tree, n);
-		ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
+		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
 	} else {
 		memset(&n->address, 0, sizeof n->address);
 		n->hostname = NULL;
-		ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name);
+		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s cleared", n->name);
 	}
 }