X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=3e4dec957f98f410b3912dc9dcf9904dca64fc4c;hb=a1b50920b9a52f86ca6e33fcb24d7fa34313a1ee;hp=579f05c2ab35988911f48f404f0681ec3066f90d;hpb=a227843b739d279b63adcf3736ebb03d856080c4;p=meshlink

diff --git a/src/node.c b/src/node.c
index 579f05c2..3e4dec95 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,44 +19,37 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "hash.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
+#include "splay_tree.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 hash_t *node_udp_cache;
 
 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) {
-       return sockaddrcmp(&a->address, &b->address);
-}
-
-void init_nodes(void) {
-	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);
+void init_nodes(meshlink_handle_t *mesh) {
+	mesh->nodes = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
+	node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
 }
 
-void exit_nodes(void) {
-	avl_delete_tree(node_udp_tree);
-	avl_delete_tree(node_tree);
+void exit_nodes(meshlink_handle_t *mesh) {
+	hash_free(node_udp_cache);
+	splay_delete_tree(mesh->nodes);
 }
 
 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();
-	EVP_CIPHER_CTX_init(&n->inctx);
-	EVP_CIPHER_CTX_init(&n->outctx);
 	n->mtu = MTU;
 	n->maxmtu = MTU;
 
@@ -65,109 +57,75 @@ node_t *new_node(void) {
 }
 
 void free_node(node_t *n) {
-	if(n->inkey)
-		free(n->inkey);
-
-	if(n->outkey)
-		free(n->outkey);
-
-	if(n->subnet_tree)
-		free_subnet_tree(n->subnet_tree);
-
 	if(n->edge_tree)
 		free_edge_tree(n->edge_tree);
 
 	sockaddrfree(&n->address);
 
-	EVP_CIPHER_CTX_cleanup(&n->inctx);
-	EVP_CIPHER_CTX_cleanup(&n->outctx);
+	ecdsa_free(n->ecdsa);
+	sptps_stop(&n->sptps);
+
+	if(n->mtutimeout.cb)
+		abort();
 
-	if(n->mtuevent)
-		event_del(n->mtuevent);
-	
 	if(n->hostname)
 		free(n->hostname);
 
 	if(n->name)
 		free(n->name);
 
+	if(n->late)
+		free(n->late);
+
 	free(n);
 }
 
-void node_add(node_t *n) {
-	avl_insert(node_tree, n);
+void node_add(meshlink_handle_t *mesh, node_t *n) {
+	n->mesh = mesh;
+	splay_insert(mesh->nodes, n);
 }
 
-void node_del(node_t *n) {
-	avl_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);
-	}
+void node_del(meshlink_handle_t *mesh, node_t *n) {
+	timeout_del(&mesh->loop, &n->mtutimeout);
 
-	for(node = n->edge_tree->head; node; node = next) {
-		next = node->next;
-		e = node->data;
-		edge_del(e);
-	}
+	for splay_each(edge_t, e, n->edge_tree)
+		edge_del(mesh, e);
 
-	avl_delete(node_udp_tree, n);
-	avl_delete(node_tree, n);
+	splay_delete(mesh->nodes, n);
 }
 
-node_t *lookup_node(char *name) {
-	node_t n = {0};
+node_t *lookup_node(meshlink_handle_t *mesh, char *name) {
+	node_t n = {NULL};
 
 	n.name = name;
 
-	return avl_search(node_tree, &n);
+	return splay_search(mesh->nodes, &n);
 }
 
-node_t *lookup_node_udp(const sockaddr_t *sa) {
-	node_t n = {0};
-
-	n.address = *sa;
-	n.name = NULL;
-
-	return avl_search(node_udp_tree, &n);
+node_t *lookup_node_udp(meshlink_handle_t *mesh, const sockaddr_t *sa) {
+	return hash_search(node_udp_cache, sa);
 }
 
-void update_node_udp(node_t *n, const sockaddr_t *sa) {
-	avl_delete(node_udp_tree, n);
+void update_node_udp(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) {
+	if(n == mesh->self) {
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Trying to update UDP address of mesh->self!");
+		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 < mesh->listen_sockets; i++) {
+			if(mesh->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);
-		avl_insert(node_udp_tree, n);
-		ifdebug(PROTOCOL) 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);
+		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
 	}
 }
-
-void dump_nodes(void) {
-	avl_node_t *node;
-	node_t *n;
-
-	logger(LOG_DEBUG, _("Nodes:"));
-
-	for(node = node_tree->head; node; node = node->next) {
-		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 pmtu %d (min %d max %d)"),
-			   n->name, n->hostname, n->outcipher ? n->outcipher->nid : 0,
-			   n->outdigest ? n->outdigest->type : 0, n->outmaclength, n->outcompression,
-			   n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
-			   n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu);
-	}
-
-	logger(LOG_DEBUG, _("End of nodes."));
-}