X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=b838c5bee4eba1a5c51afccb560878f7c21dc435;hb=fe1a9111456a73a6e690927e90d8bfa1e1d0ad22;hp=edf2c85809134bc55581b7a9b5d46d562c2be663;hpb=e401f4fcb9bf48e4efd04f9671a7c6cf44ff0439;p=meshlink

diff --git a/src/node.c b/src/node.c
index edf2c858..b838c5be 100644
--- a/src/node.c
+++ b/src/node.c
@@ -34,21 +34,17 @@ static int node_compare(const node_t *a, const node_t *b) {
 }
 
 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);
 	mesh->node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
-	pthread_mutex_unlock(&(mesh->nodes_mutex));
 }
 
 void exit_nodes(meshlink_handle_t *mesh) {
-	pthread_mutex_lock(&(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;
-	pthread_mutex_unlock(&(mesh->nodes_mutex));
 }
 
 node_t *new_node(void) {
@@ -58,6 +54,7 @@ node_t *new_node(void) {
 	n->edge_tree = new_edge_tree();
 	n->mtu = MTU;
 	n->maxmtu = MTU;
+	n->devclass = _DEV_CLASS_MAX;
 
 	return n;
 }
@@ -74,45 +71,34 @@ void free_node(node_t *n) {
 	if(n->mtutimeout.cb)
 		abort();
 
-	if(n->hostname)
-		free(n->hostname);
-
-	if(n->name)
-		free(n->name);
+	free(n->hostname);
+	free(n->name);
+	free(n->late);
 
-	if(n->late)
-		free(n->late);
+	utcp_exit(n->utcp);
 
 	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)
 		edge_del(mesh, e);
 
 	splay_delete(mesh->nodes, n);
-	pthread_mutex_unlock(&(mesh->nodes_mutex));
 }
 
 node_t *lookup_node(meshlink_handle_t *mesh, const char *name) {
-	node_t n = {NULL};
-	node_t* result;
-
-	n.name = name;
+	const node_t n = {.name = (char *)name};
+	node_t *result;
 
-	pthread_mutex_lock(&(mesh->nodes_mutex));
 	result = splay_search(mesh->nodes, &n);
-	pthread_mutex_unlock(&(mesh->nodes_mutex));
 
 	return result;
 }
@@ -123,7 +109,7 @@ node_t *lookup_node_udp(meshlink_handle_t *mesh, 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;
 	}
 
@@ -141,6 +127,6 @@ void update_node_udp(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) {
 		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);
 	}
 }