X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=f43619a2a4b2f38fd2cc6e1c2d311eb7c8cef423;hb=e4e5a81447142da0fb1291b2d2119ed6981b89e5;hp=52aa6d429789785b872b2a9e0e29fc8bb1df67c3;hpb=528a8616e36ff08ddf1f9f16f748a272e48846be;p=meshlink

diff --git a/src/node.c b/src/node.c
index 52aa6d42..f43619a2 100644
--- a/src/node.c
+++ b/src/node.c
@@ -29,20 +29,22 @@
 #include "utils.h"
 #include "xalloc.h"
 
-static hash_t *node_udp_cache;
-
 static int node_compare(const node_t *a, const node_t *b) {
 	return strcmp(a->name, b->name);
 }
 
-void init_nodes(void) {
+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));
+	mesh->node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
 }
 
-void exit_nodes(void) {
-	hash_free(node_udp_cache);
-	splay_delete_tree(mesh->nodes);
+void exit_nodes(meshlink_handle_t *mesh) {
+	if(mesh->node_udp_cache)
+		hash_free(mesh->node_udp_cache);
+	if(mesh->nodes)
+		splay_delete_tree(mesh->nodes);
+	mesh->node_udp_cache = NULL;
+	mesh->nodes = NULL;
 }
 
 node_t *new_node(void) {
@@ -65,7 +67,8 @@ void free_node(node_t *n) {
 	ecdsa_free(n->ecdsa);
 	sptps_stop(&n->sptps);
 
-	timeout_del(&n->mtutimeout);
+	if(n->mtutimeout.cb)
+		abort();
 
 	if(n->hostname)
 		free(n->hostname);
@@ -79,49 +82,53 @@ void free_node(node_t *n) {
 	free(n);
 }
 
-void node_add(node_t *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) {
+void node_del(meshlink_handle_t *mesh, node_t *n) {
+	timeout_del(&mesh->loop, &n->mtutimeout);
+
 	for splay_each(edge_t, e, n->edge_tree)
-		edge_del(e);
+		edge_del(mesh, e);
 
 	splay_delete(mesh->nodes, n);
 }
 
-node_t *lookup_node(char *name) {
-	node_t n = {NULL};
+node_t *lookup_node(meshlink_handle_t *mesh, const char *name) {
+	const node_t n = {.name = (char *)name};
+	node_t *result;
 
-	n.name = name;
+	result = splay_search(mesh->nodes, &n);
 
-	return splay_search(mesh->nodes, &n);
+	return result;
 }
 
-node_t *lookup_node_udp(const sockaddr_t *sa) {
-	return hash_search(node_udp_cache, sa);
+node_t *lookup_node_udp(meshlink_handle_t *mesh, const sockaddr_t *sa) {
+	return hash_search(mesh->node_udp_cache, sa);
 }
 
-void update_node_udp(node_t *n, const sockaddr_t *sa) {
+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!");
+		logger(mesh, MESHLINK_WARNING, "Trying to update UDP address of mesh->self!");
 		return;
 	}
 
-	hash_insert(node_udp_cache, &n->address, NULL);
+	hash_insert(mesh->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) {
+		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);
+		hash_insert(mesh->node_udp_cache, sa, n);
 		free(n->hostname);
 		n->hostname = sockaddr2hostname(&n->address);
-		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
+		logger(mesh, MESHLINK_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
 	}
 }