X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=79531e462012a408d173dbb7c00272c7251b6dd9;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=0159f9dd965bc57c219805dac01868c5a614ee2a;hpb=79e46d08a46f2fef2ee4e8eac7ba487007160564;p=meshlink

diff --git a/src/node.c b/src/node.c
index 0159f9dd..79531e46 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,7 +1,6 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>,
 
     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
@@ -20,17 +19,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 */
+splay_tree_t *node_tree;
+static hash_t *node_udp_cache;
 
 node_t *myself;
 
@@ -38,31 +37,20 @@ 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);
 }
 
 node_t *new_node(void) {
-	node_t *n = xmalloc_and_zero(sizeof *n);
+	node_t *n = xzalloc(sizeof *n);
 
-	n->subnet_tree = new_subnet_tree();
+	if(replaywin) n->late = xzalloc(replaywin);
 	n->edge_tree = new_edge_tree();
 	n->mtu = MTU;
 	n->maxmtu = MTU;
@@ -71,27 +59,30 @@ node_t *new_node(void) {
 }
 
 void free_node(node_t *n) {
-	if(n->subnet_tree)
-		free_subnet_tree(n->subnet_tree);
-
 	if(n->edge_tree)
 		free_edge_tree(n->edge_tree);
 
 	sockaddrfree(&n->address);
 
-	cipher_close(&n->incipher);
-	digest_close(&n->indigest);
-	cipher_close(&n->outcipher);
-	digest_close(&n->outdigest);
+	cipher_close(n->incipher);
+	digest_close(n->indigest);
+	cipher_close(n->outcipher);
+	digest_close(n->outdigest);
+
+	ecdsa_free(n->ecdsa);
+	sptps_stop(&n->sptps);
+
+	timeout_del(&n->mtutimeout);
 
-	event_del(&n->mtuevent);
-	
 	if(n->hostname)
 		free(n->hostname);
 
 	if(n->name)
 		free(n->name);
 
+	if(n->late)
+		free(n->late);
+
 	free(n);
 }
 
@@ -100,28 +91,14 @@ void node_add(node_t *n) {
 }
 
 void node_del(node_t *n) {
-	splay_node_t *node, *next;
-	edge_t *e;
-	subnet_t *s;
-
-	for(node = n->subnet_tree->head; node; node = next) {
-		next = node->next;
-		s = node->data;
-		subnet_del(n, s);
-	}
-
-	for(node = n->edge_tree->head; node; node = next) {
-		next = node->next;
-		e = node->data;
+	for splay_each(edge_t, e, n->edge_tree)
 		edge_del(e);
-	}
 
-	splay_delete(node_udp_tree, n);
 	splay_delete(node_tree, n);
 }
 
 node_t *lookup_node(char *name) {
-	node_t n = {0};
+	node_t n = {NULL};
 
 	n.name = name;
 
@@ -129,44 +106,29 @@ node_t *lookup_node(char *name) {
 }
 
 node_t *lookup_node_udp(const sockaddr_t *sa) {
-	node_t n = {0};
-
-	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) {
-	splay_delete(node_udp_tree, n);
+	if(n == myself) {
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Trying to update UDP address of myself!");
+		return;
+	}
 
-	if(n->hostname)
-		free(n->hostname);
+	hash_insert(node_udp_cache, &n->address, NULL);
 
 	if(sa) {
 		n->address = *sa;
+		n->sock = 0;
+		for(int i = 0; i < listen_sockets; i++) {
+			if(listen_socket[i].sa.sa.sa_family == sa->sa.sa_family) {
+				n->sock = i;
+				break;
+			}
+		}
+		hash_insert(node_udp_cache, sa, n);
+		free(n->hostname);
 		n->hostname = sockaddr2hostname(&n->address);
-		splay_insert(node_udp_tree, n);
-		logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
-	} else {
-		memset(&n->address, 0, sizeof n->address);
-		n->hostname = 0;
-		ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name);
-	}
-}
-
-bool dump_nodes(connection_t *c) {
-	splay_node_t *node;
-	node_t *n;
-
-	for(node = node_tree->head; node; node = node->next) {
-		n = node->data;
-		send_request(c, "%d %d %s at %s cipher %d digest %d maclength %zd compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)", CONTROL, REQ_DUMP_NODES,
-			   n->name, n->hostname, cipher_get_nid(&n->outcipher),
-			   digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression,
-			   n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
-			   n->via ? n->via->name : "-", n->distance, n->mtu, n->minmtu, n->maxmtu);
+		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
 	}
-
-	return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
 }