X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=ebd2c7c2c9421d56c1225c89c95f7d593189c278;hb=f1fec466e232c00c668422014029dce9114d3add;hp=5df8b667467ff4aee7f43ca8815c10d940e8758b;hpb=5a132550deb58473285e5f91705d286aef47be71;p=tinc

diff --git a/src/node.c b/src/node.c
index 5df8b667..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);
 	}
 }
 
@@ -185,8 +185,8 @@ int dump_nodes(struct evbuffer *out) {
 		n = node->data;
 		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), n->outmaclength, n->outcompression,
-			   n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
+			   digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression,
+			   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;
 	}