1 files changed, 47 insertions, 125 deletions

diff --git a/src/libknot/util/debug.c b/src/libknot/util/debug.c
index a6555ad..9f8d852 100644
--- a/src/libknot/util/debug.c
+++ b/src/libknot/util/debug.c
@@ -22,123 +22,39 @@
 
 #include "util/utils.h"
 #include "util/debug.h"
+#include "libknot/rrset.h"
+#include "common/descriptor.h"
 #include "common/print.h"
 
-void knot_rdata_dump(knot_rdata_t *rdata, uint32_t type, char loaded_zone)
+#if defined(KNOT_ZONE_DEBUG)
+static void knot_node_dump_from_tree(knot_node_t *node, void *data)
 {
-#if defined(KNOT_ZONE_DEBUG) || defined(KNOT_RDATA_DEBUG)
-	fprintf(stderr, "      ------- RDATA -------\n");
-	if (rdata == NULL) {
-		fprintf(stderr, "      There are no rdata in this RRset!\n");
-		fprintf(stderr, "      ------- RDATA -------\n");
-		return;
-	}
-	knot_rrtype_descriptor_t *desc = knot_rrtype_descriptor_by_type(type);
-	assert(desc != NULL);
-	char *name;
-
-	for (int i = 0; i < rdata->count; i++) {
-		if (rdata->items[i].raw_data == NULL) {
-			continue;
-		}
-		if (desc->wireformat[i] == KNOT_RDATA_WF_COMPRESSED_DNAME ||
-		    desc->wireformat[i] == KNOT_RDATA_WF_UNCOMPRESSED_DNAME ||
-		    desc->wireformat[i] == KNOT_RDATA_WF_LITERAL_DNAME ) {
-			assert(rdata->items[i].dname != NULL);
-			name = knot_dname_to_str(rdata->items[i].dname);
-			fprintf(stderr, "      DNAME: %d: %s (%p)\n",
-			       i, name, rdata->items[i].dname);
-			free(name);
-			if (loaded_zone) {
-				if (rdata->items[i].dname->node) {
-					name =
-					knot_dname_to_str(rdata->items[i].dname->node->owner);
-					fprintf(stderr, "      Has node owner: %s\n", name);
-					free(name);
-				} else {
-					fprintf(stderr, "      No node set\n");
-				}
-			}
-			fprintf(stderr, "      labels: ");
-			hex_print((char *)rdata->items[i].dname->labels,
-			                 rdata->items[i].dname->label_count);
-
-		} else {
-			assert(rdata->items[i].raw_data != NULL);
-			fprintf(stderr, "      %d: raw_data: length: %d\n", i,
-			       *(rdata->items[i].raw_data));
-			fprintf(stderr, "      ");
-			hex_print(((char *)(
-				rdata->items[i].raw_data + 1)),
-				rdata->items[i].raw_data[0]);
-		}
-	}
-	fprintf(stderr, "      ------- RDATA -------\n");
-#endif
+	UNUSED(data);
+	knot_node_dump(node);
 }
-
-void knot_rrset_dump(const knot_rrset_t *rrset, char loaded_zone)
-{
-#if defined(KNOT_ZONE_DEBUG) || defined(KNOT_RRSET_DEBUG)
-	fprintf(stderr, "  ------- RRSET -------\n");
-	fprintf(stderr, "  %p\n", rrset);
-	if (!rrset) {
-		return;
-	}
-        char *name = knot_dname_to_str(rrset->owner);
-        fprintf(stderr, "  owner: %s\n", name);
-        free(name);
-	fprintf(stderr, "  type: %s\n", knot_rrtype_to_string(rrset->type));
-	fprintf(stderr, "  class: %d\n", rrset->rclass);
-	fprintf(stderr, "  ttl: %d\n", rrset->ttl);
-
-        fprintf(stderr, "  RRSIGs:\n");
-        if (rrset->rrsigs != NULL) {
-                knot_rrset_dump(rrset->rrsigs, loaded_zone);
-        } else {
-                fprintf(stderr, "  none\n");
-        }
-
-	if (rrset->rdata == NULL) {
-		fprintf(stderr, "  NO RDATA!\n");
-		fprintf(stderr, "  ------- RRSET -------\n");
-		return;
-	}
-
-	knot_rdata_t *tmp = rrset->rdata;
-	
-	while (tmp->next != rrset->rdata && tmp->next != NULL) {
-		knot_rdata_dump(tmp, rrset->type, loaded_zone);
-		tmp = tmp->next;
-	}
-
-	knot_rdata_dump(tmp, rrset->type, loaded_zone);
-
-	fprintf(stderr, "  ------- RRSET -------\n");
 #endif
-}
 
-void knot_node_dump(knot_node_t *node, void *loaded_zone)
+void knot_node_dump(knot_node_t *node)
 {
 #if defined(KNOT_ZONE_DEBUG) || defined(KNOT_NODE_DEBUG)
 	//char loaded_zone = *((char*) data);
 	char *name;
 
-	fprintf(stderr, "------- NODE --------\n");
+	dbg_node_detail("------- NODE --------\n");
 	name = knot_dname_to_str(node->owner);
-	fprintf(stderr, "owner: %s\n", name);
+	dbg_node_detail("owner: %s\n", name);
 	free(name);
-	fprintf(stderr, "labels: ");
-	hex_print((char *)node->owner->labels, node->owner->label_count);
-	fprintf(stderr, "node: %p\n", node);
-	fprintf(stderr, "node (in node's owner): %p\n", node->owner->node);
+	dbg_node_detail("labels: ");
+	hex_print(node->owner->labels, node->owner->label_count);
+	dbg_node_detail("node: %p\n", node);
+	dbg_node_detail("node (in node's owner): %p\n", node->owner->node);
 
 	if (knot_node_is_deleg_point(node)) {
-		fprintf(stderr, "delegation point\n");
+		dbg_node_detail("delegation point\n");
 	}
 
 	if (knot_node_is_non_auth(node)) {
-		fprintf(stderr, "non-authoritative node\n");
+		dbg_node_detail("non-authoritative node\n");
 	}
 
 	if (node->parent != NULL) {
@@ -146,83 +62,89 @@ void knot_node_dump(knot_node_t *node, void *loaded_zone)
 		 *        e.g. when applying changesets.
 		 */
 		name = knot_dname_to_str(node->parent->owner);
-		fprintf(stderr, "parent: %s\n", name);
+		dbg_node_detail("parent: %s\n", name);
 		free(name);
 	} else {
-		fprintf(stderr, "no parent\n");
+		dbg_node_detail("no parent\n");
 	}
 
 	if (node->prev != NULL) {
-		fprintf(stderr, "previous node: %p\n", node->prev);
+		dbg_node_detail("previous node: %p\n", node->prev);
 		/*! \todo This causes segfault when prev was free'd,
 		 *        e.g. when applying changesets.
 		 */
 		name = knot_dname_to_str(node->prev->owner);
-		fprintf(stderr, "previous node: %s\n", name);
+		dbg_node_detail("previous node: %s\n", name);
 		free(name);
 	} else {
-		fprintf(stderr, "previous node: none\n");
+		dbg_node_detail("previous node: none\n");
 	}
 
 	knot_rrset_t **rrsets = knot_node_get_rrsets(node);
 
-	fprintf(stderr, "Wildcard child: ");
+	dbg_node_detail("Wildcard child: ");
 
 	if (node->wildcard_child != NULL) {
 		/*! \todo This causes segfault when wildcard child was free'd,
 		 *        e.g. when applying changesets.
 		 */
 		name = knot_dname_to_str(node->wildcard_child->owner);
-		fprintf(stderr, "%s\n", name);
+		dbg_node_detail("%s\n", name);
 		free(name);
 	} else {
-		fprintf(stderr, "none\n");
+		dbg_node_detail("none\n");
 	}
 
-	fprintf(stderr, "NSEC3 node: ");
+	dbg_node_detail("NSEC3 node: ");
 
 	if (node->nsec3_node != NULL) {
-		/*! \todo This causes segfault when nsec3_node was free'd,
+		/*! \todo This causes segfault when n	sec3_node was free'd,
 		 *        e.g. when applying changesets.
 		 */
 		name = knot_dname_to_str(node->nsec3_node->owner);
-		fprintf(stderr, "%s\n", name);
+		dbg_node_detail("%s\n", name);
 		free(name);
 	} else {
-		fprintf(stderr, "none\n");
+		dbg_node_detail("none\n");
 	}
-	
-	fprintf(stderr, "Zone: %p\n", node->zone);
 
-	fprintf(stderr, "RRSet count: %d\n", node->rrset_count);
+	dbg_node_detail("Zone: %p\n", node->zone);
+
+	dbg_node_detail("RRSet count: %d\n", node->rrset_count);
 
 	for (int i = 0; i < node->rrset_count; i++) {
-		knot_rrset_dump(rrsets[i], (int) loaded_zone);
+		knot_rrset_dump(rrsets[i]);
 	}
 	free(rrsets);
 	//assert(node->owner->node == node);
-	fprintf(stderr, "------- NODE --------\n");
+	dbg_node_detail("------- NODE --------\n");
+#else
+	UNUSED(node);
 #endif
 }
 
-void knot_zone_contents_dump(knot_zone_contents_t *zone, char loaded_zone)
+void knot_zone_contents_dump(knot_zone_contents_t *zone)
 {
 #if defined(KNOT_ZONE_DEBUG)
 	if (!zone) {
-		fprintf(stderr, "------- STUB ZONE --------\n");
+		dbg_zone_detail("------- STUB ZONE --------\n");
 		return;
 	}
 
-	fprintf(stderr, "------- ZONE --------\n");
+	dbg_zone_detail("------- ZONE --------\n");
+
+	knot_zone_contents_tree_apply_inorder(zone, knot_node_dump_from_tree,
+					      NULL);
 
-	knot_zone_contents_tree_apply_inorder(zone, knot_node_dump, (void *)&loaded_zone);
+	dbg_zone_detail("------- ZONE --------\n");
 
-	fprintf(stderr, "------- ZONE --------\n");
-	
-	fprintf(stderr, "------- NSEC 3 tree -\n");
+	dbg_zone_detail("------- NSEC 3 tree -\n");
 
-	knot_zone_contents_nsec3_apply_inorder(zone, knot_node_dump, (void *)&loaded_zone);
+	knot_zone_contents_nsec3_apply_inorder(zone, knot_node_dump_from_tree,
+					       NULL);
 
-	fprintf(stderr, "------- NSEC 3 tree -\n");
+	dbg_zone_detail("------- NSEC 3 tree -\n");
+#else
+	UNUSED(zone);
 #endif
 }