- splay_node_t *node;
- node_t *n;
-
- for(node = node_tree->head; node; node = node->next) {
- n = node->data;
- send_request(c, "%d %d %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)", CONTROL, REQ_DUMP_NODES,
- n->name, n->hostname, cipher_get_nid(&n->outcipher),
- 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);
+ 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) {
+ 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 %d %d %d %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_NODES,
+ n->name, id, n->hostname ? n->hostname : "unknown port unknown",
+#ifdef DISABLE_LEGACY
+ 0, 0, 0,
+#else
+ cipher_get_nid(n->outcipher), digest_get_nid(n->outdigest), (int)digest_length(n->outdigest),
+#endif
+ n->outcompression, n->options, bitfield_to_int(&n->status, sizeof(n->status)),
+ n->nexthop ? n->nexthop->name : "-", n->via && n->via->name ? n->via->name : "-", n->distance,
+ n->mtu, n->minmtu, n->maxmtu, (long)n->last_state_change, n->udp_ping_rtt,
+ n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);