X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnode.c;h=ebd2c7c2c9421d56c1225c89c95f7d593189c278;hp=6df236a1a76681ffa5cf1ce8ef47b775acac7625;hb=075e6828a7533e7daa790225f17aa6bb39703278;hpb=9b129c07e273ae113f3c67a9feeee82e8146f3a1 diff --git a/src/node.c b/src/node.c index 6df236a1..ebd2c7c2 100644 --- a/src/node.c +++ b/src/node.c @@ -131,8 +131,8 @@ void node_del(node_t *n) { edge_del(e); } - splay_delete(node_tree, n); splay_delete(node_udp_tree, n); + splay_delete(node_tree, n); } node_t *lookup_node(char *name) { @@ -166,12 +166,12 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) if(sa) { n->address = *sa; n->hostname = sockaddr2hostname(&n->address); - splay_delete(node_udp_tree, n); splay_insert(node_udp_tree, n); logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname); } else { memset(&n->address, 0, sizeof n->address); - logger(LOG_DEBUG, "UDP address of %s cleared", n->name); + n->hostname = 0; + ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name); } } @@ -186,7 +186,7 @@ int dump_nodes(struct evbuffer *out) { if(evbuffer_add_printf(out, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n"), n->name, n->hostname, cipher_get_nid(&n->outcipher), digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression, - n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-", + n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-", n->via ? n->via->name : "-", n->distance, n->mtu, n->minmtu, n->maxmtu) == -1) return errno; }