X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnode.c;h=b8caed6c7e06ca182f671fd046f8be4d44d76611;hp=0a7b4a5254921d9b3e263b3d62c21ff3fc2149d7;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=391a8674fcd886165dc02154d3ef0d3377f2c840

diff --git a/src/node.c b/src/node.c
index 0a7b4a52..b8caed6c 100644
--- a/src/node.c
+++ b/src/node.c
@@ -29,116 +29,147 @@
 #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(meshlink_handle_t *mesh) {
-	pthread_mutex_lock(&(mesh->nodes_mutex));
 	mesh->nodes = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
-	node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
-	pthread_mutex_unlock(&(mesh->nodes_mutex));
+	mesh->node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
 }
 
 void exit_nodes(meshlink_handle_t *mesh) {
-	pthread_mutex_lock(&(mesh->nodes_mutex));
-	hash_free(node_udp_cache);
-	splay_delete_tree(mesh->nodes);
-	pthread_mutex_unlock(&(mesh->nodes_mutex));
+	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) {
-	node_t *n = xzalloc(sizeof *n);
+	node_t *n = xzalloc(sizeof(*n));
 
-	if(replaywin) n->late = xzalloc(replaywin);
 	n->edge_tree = new_edge_tree();
 	n->mtu = MTU;
 	n->maxmtu = MTU;
+	n->devclass = DEV_CLASS_UNKNOWN;
 
 	return n;
 }
 
 void free_node(node_t *n) {
-	if(n->edge_tree)
+	n->status.destroyed = true;
+
+	utcp_exit(n->utcp);
+
+	if(n->edge_tree) {
 		free_edge_tree(n->edge_tree);
+	}
 
 	sockaddrfree(&n->address);
 
 	ecdsa_free(n->ecdsa);
 	sptps_stop(&n->sptps);
 
-	if(n->mtutimeout.cb)
+	if(n->mtutimeout.cb) {
 		abort();
+	}
 
-	if(n->hostname)
-		free(n->hostname);
-
-	if(n->name)
-		free(n->name);
-
-	if(n->late)
-		free(n->late);
+	free(n->name);
+	free(n->canonical_address);
 
 	free(n);
 }
 
 void node_add(meshlink_handle_t *mesh, node_t *n) {
-	pthread_mutex_lock(&(mesh->nodes_mutex));
 	n->mesh = mesh;
 	splay_insert(mesh->nodes, n);
-	pthread_mutex_unlock(&(mesh->nodes_mutex));
 }
 
 void node_del(meshlink_handle_t *mesh, node_t *n) {
-	pthread_mutex_lock(&(mesh->nodes_mutex));
 	timeout_del(&mesh->loop, &n->mtutimeout);
 
-	for splay_each(edge_t, e, n->edge_tree)
+	for splay_each(edge_t, e, n->edge_tree) {
 		edge_del(mesh, e);
+	}
 
 	splay_delete(mesh->nodes, n);
-	pthread_mutex_unlock(&(mesh->nodes_mutex));
 }
 
-node_t *lookup_node(meshlink_handle_t *mesh, char *name) {
-	node_t n = {NULL};
-	node_t* result;
+node_t *lookup_node(meshlink_handle_t *mesh, const char *name) {
+	const node_t n = {.name = (char *)name};
+	node_t *result;
 
-	n.name = name;
-
-	pthread_mutex_lock(&(mesh->nodes_mutex));
 	result = splay_search(mesh->nodes, &n);
-	pthread_mutex_unlock(&(mesh->nodes_mutex));
 
 	return result;
 }
 
 node_t *lookup_node_udp(meshlink_handle_t *mesh, const sockaddr_t *sa) {
-	return hash_search(node_udp_cache, sa);
+	return hash_search(mesh->node_udp_cache, 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 < 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);
-		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
+
+		hash_insert(mesh->node_udp_cache, sa, n);
+
+		node_add_recent_address(mesh, n, sa);
+
+		if(mesh->log_level <= MESHLINK_DEBUG) {
+			char *hostname = sockaddr2hostname(&n->address);
+			logger(mesh, MESHLINK_DEBUG, "UDP address of %s set to %s", n->name, hostname);
+			free(hostname);
+		}
+	}
+}
+
+bool node_add_recent_address(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) {
+	(void)mesh;
+	bool found = false;
+	int i;
+
+	/* Check if we already know this address */
+	for(i = 0; i < MAX_RECENT && n->recent[i].sa.sa_family; i++) {
+		if(!sockaddrcmp(&n->recent[i], sa)) {
+			found = true;
+			break;
+		}
+	}
+
+	if(found && i == 0) {
+		/* It's already the most recent address, nothing to do. */
+		return false;
 	}
+
+	if(i >= MAX_RECENT) {
+		i = MAX_RECENT - 1;
+	}
+
+	memmove(n->recent + 1, n->recent, i * sizeof(*n->recent));
+	memcpy(n->recent, sa, SALEN(sa->sa));
+
+	n->status.dirty = true;
+	return !found;
 }