#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) {
n->edge_tree = new_edge_tree();
n->mtu = MTU;
n->maxmtu = MTU;
+ n->devclass = _DEV_CLASS_MAX;
return 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;
-
- n.name = name;
+node_t *lookup_node(meshlink_handle_t *mesh, const char *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;
}
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;
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);
}
}