-void dump_nodes(void)
-{
- avl_node_t *node;
- node_t *n;
-cp
- syslog(LOG_DEBUG, _("Nodes:"));
-
- for(node = node_tree->head; node; node = node->next)
- {
- n = (connection_t *)node->data;
- syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x"),
- n->name, n->hostname, n->port, n->options,
- n->socket, n->meta_socket, n->status);
- }
-
- syslog(LOG_DEBUG, _("End of nodes."));
-cp
+bool dump_nodes(connection_t *c) {
+ 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 %zu %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, 0UL,
+#else
+ cipher_get_nid(n->outcipher), digest_get_nid(n->outdigest), 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);
+ }
+
+ return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
+}
+
+bool dump_traffic(connection_t *c) {
+ for splay_each(node_t, n, &node_tree)
+ send_request(c, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_TRAFFIC,
+ n->name, n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);
+
+ return send_request(c, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);