X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=4fbec08fabcb8e1a18e8588f089661b3832f5a01;hp=9d3592535c267dcdcfca714045abf272f3c575cb;hb=23e151aeed6b3ffe0fab10f51ffdb134deb7a852;hpb=3308d13e7e3bf20cfeaf6f2ab17228a9820cea66

diff --git a/src/node.c b/src/node.c
index 9d359253..4fbec08f 100644
--- a/src/node.c
+++ b/src/node.c
@@ -137,8 +137,8 @@ void node_del(node_t *n)
 		edge_del(e);
 	}
 
-	avl_delete(node_tree, n);
 	avl_delete(node_udp_tree, n);
+	avl_delete(node_tree, n);
 }
 
 node_t *lookup_node(char *name)
@@ -174,12 +174,12 @@ void update_node_udp(node_t *n, const sockaddr_t *sa)
 	if(sa) {
 		n->address = *sa;
 		n->hostname = sockaddr2hostname(&n->address);
-		avl_delete(node_udp_tree, n);
 		avl_insert(node_udp_tree, n);
-		logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
+		ifdebug(PROTOCOL) 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);
 	}
 }
 
@@ -197,7 +197,7 @@ void dump_nodes(void)
 		logger(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %d)"),
 			   n->name, n->hostname, n->outcipher ? n->outcipher->nid : 0,
 			   n->outdigest ? n->outdigest->type : 0, n->outmaclength, 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->mtu, n->minmtu, n->maxmtu);
 	}