X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=160bcb38248805e0724930632186c24391c2dfb1;hb=d0bf55f32b407fa153dd5d6e41ccefcbb4072611;hp=b8caed6c7e06ca182f671fd046f8be4d44d76611;hpb=8582c3b5e0ee3f6b547dbaed7a1214819d3dfc91;p=meshlink-tiny diff --git a/src/node.c b/src/node.c index b8caed6..160bcb3 100644 --- a/src/node.c +++ b/src/node.c @@ -35,26 +35,19 @@ static int node_compare(const node_t *a, const node_t *b) { void init_nodes(meshlink_handle_t *mesh) { 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)); } 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) { node_t *n = xzalloc(sizeof(*n)); - n->edge_tree = new_edge_tree(); n->mtu = MTU; n->maxmtu = MTU; n->devclass = DEV_CLASS_UNKNOWN; @@ -67,10 +60,6 @@ void free_node(node_t *n) { utcp_exit(n->utcp); - if(n->edge_tree) { - free_edge_tree(n->edge_tree); - } - sockaddrfree(&n->address); ecdsa_free(n->ecdsa); @@ -93,11 +82,6 @@ void node_add(meshlink_handle_t *mesh, 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(mesh, e); - } - splay_delete(mesh->nodes, n); } @@ -110,41 +94,6 @@ node_t *lookup_node(meshlink_handle_t *mesh, const char *name) { return result; } -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(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) { - if(n == mesh->self) { - logger(mesh, MESHLINK_WARNING, "Trying to update UDP address of mesh->self!"); - return; - } - - 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(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;