splay_tree_t *node_tree;
static splay_tree_t *node_id_tree;
-static hash_t *node_udp_cache;
-static hash_t *node_id_cache;
+static splay_tree_t *node_udp_tree;
node_t *myself;
return memcmp(&a->id, &b->id, sizeof(node_id_t));
}
+static int node_udp_compare(const node_t *a, const node_t *b) {
+ int result = sockaddrcmp(&a->address, &b->address);
+ if (result)
+ return result;
+ return (a->name && b->name) ? strcmp(a->name, b->name) : 0;
+}
+
void init_nodes(void) {
node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
node_id_tree = splay_alloc_tree((splay_compare_t) node_id_compare, NULL);
- node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
- node_id_cache = hash_alloc(0x100, sizeof(node_id_t));
+ node_udp_tree = splay_alloc_tree((splay_compare_t) node_udp_compare, NULL);
}
void exit_nodes(void) {
- hash_free(node_id_cache);
- hash_free(node_udp_cache);
+ splay_delete_tree(node_udp_tree);
splay_delete_tree(node_id_tree);
splay_delete_tree(node_tree);
}
sptps_stop(&n->sptps);
timeout_del(&n->udp_ping_timeout);
- timeout_del(&n->mtutimeout);
if(n->hostname)
free(n->hostname);
}
void node_del(node_t *n) {
- hash_delete(node_udp_cache, &n->address);
- hash_delete(node_id_cache, &n->id);
+ splay_delete(node_udp_tree, n);
for splay_each(subnet_t, s, n->subnet_tree)
subnet_del(n, s);
}
node_t *lookup_node_id(const node_id_t *id) {
- node_t *n = hash_search(node_id_cache, id);
- if(!n) {
- node_t tmp = {.id = *id};
- n = splay_search(node_id_tree, &tmp);
- if(n)
- hash_insert(node_id_cache, id, n);
- }
-
- return n;
+ node_t n = {.id = *id};
+ return splay_search(node_id_tree, &n);
}
node_t *lookup_node_udp(const sockaddr_t *sa) {
- return hash_search(node_udp_cache, sa);
+ node_t tmp = {.address = *sa};
+ return splay_search(node_udp_tree, &tmp);
}
void update_node_udp(node_t *n, const sockaddr_t *sa) {
return;
}
- hash_delete(node_udp_cache, &n->address);
+ splay_delete(node_udp_tree, n);
if(sa) {
n->address = *sa;
break;
}
}
- hash_insert(node_udp_cache, sa, n);
+ splay_insert(node_udp_tree, 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);
/* invalidate UDP information - note that this is a security feature as well to make sure
we can't be tricked into flooding any random address with UDP packets */
n->status.udp_confirmed = false;
+ n->maxrecentlen = 0;
n->mtuprobes = 0;
n->minmtu = 0;
n->maxmtu = MTU;
for splay_each(node_t, n, node_tree) {
char id[2 * sizeof n->id + 1];
for (size_t c = 0; c < sizeof n->id; ++c)
- sprintf(id + 2 * c, "%02hhx", n->id.x[c]);
+ snprintf(id + 2 * c, 3, "%02x", n->id.x[c]);
id[sizeof id - 1] = 0;
- send_request(c, "%d %d %s %s %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", CONTROL, REQ_DUMP_NODES,
+ send_request(c, "%d %d %s %s %s %d %d %d %d %x %x %s %s %d %d %d %d %ld", CONTROL, REQ_DUMP_NODES,
n->name, id, n->hostname ?: "unknown port unknown",
#ifdef DISABLE_LEGACY
0, 0, 0,