Merge branch 'mesh_topology_output' into roles

[meshlink] / src / node.c

diff --git a/src/node.c b/src/node.c
index b7b39927948b2e8579b71a1f07a2aa9261266f99..f43619a2a4b2f38fd2cc6e1c2d311eb7c8cef423 100644 (file)
--- 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) {
@@ -87,32 +83,24 @@ void free_node(node_t *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, 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;
 }
@@ -123,7 +111,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 +129,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);
        }
 }