}
void exit_nodes(meshlink_handle_t *mesh) {
- if(mesh->node_udp_cache)
+ if(mesh->node_udp_cache) {
hash_free(mesh->node_udp_cache);
- if(mesh->nodes)
+ }
+
+ if(mesh->nodes) {
splay_delete_tree(mesh->nodes);
+ }
+
mesh->node_udp_cache = NULL;
mesh->nodes = NULL;
}
n->edge_tree = new_edge_tree();
n->mtu = MTU;
n->maxmtu = MTU;
- n->devclass = _DEV_CLASS_MAX;
+ n->devclass = DEV_CLASS_UNKNOWN;
return n;
}
void free_node(node_t *n) {
n->status.destroyed = true;
- if(n->edge_tree)
+ 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();
+ }
free(n->name);
-
- utcp_exit(n->utcp);
+ free(n->canonical_address);
free(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)
+ for splay_each(edge_t, e, n->edge_tree) {
edge_del(mesh, e);
+ }
splay_delete(mesh->nodes, n);
}
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;
hash_insert(mesh->node_udp_cache, sa, n);
- meshlink_hint_address(mesh, (meshlink_node_t *)n, &sa->sa);
+ node_add_recent_address(mesh, n, sa);
- if(mesh->log_level >= MESHLINK_DEBUG) {
+ 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;
+}