Commit 37a977c0 authored by Jan Kadlec's avatar Jan Kadlec

Merge remote branch 'origin/zoneparser' into development

Conflicts:
	src/zone/zone-load.c
parents 2c6050d2 9b58f500
......@@ -438,11 +438,11 @@ int dnslib_zone_dump_binary(dnslib_zone_t *zone, const char *filename)
sizeof(zone->node_count),
1, f);
printf("written %d normal nodes\n", tmp_count);
debug_zp("written %d normal nodes\n", tmp_count);
printf("written %d nsec3 nodes\n", node_count);
debug_zp("written %d nsec3 nodes\n", node_count);
printf("authorative nodes: %u\n", zone->node_count);
debug_zp("authorative nodes: %u\n", zone->node_count);
fclose(f);
......
......@@ -80,8 +80,6 @@ dnslib_rdata_t *dnslib_load_rdata(uint16_t type, FILE *f)
if (has_wildcard) {
fread(&tmp_id, sizeof(void *), 1, f);
printf("read ID: %zu\n", (size_t)tmp_id);
getchar();
items[i].dname->node =
id_array[(size_t)tmp_id]->node;
} else {
......@@ -272,7 +270,7 @@ dnslib_node_t *dnslib_load_node(FILE *f)
if ((tmp_rrset = dnslib_load_rrset(f)) == NULL) {
dnslib_node_free(&node, 1);
//TODO what else to free?
printf("could not load rrset\n");
fprintf(stderr, "Error: could not load rrset\n");
return NULL;
}
tmp_rrset->owner = node->owner;
......@@ -355,7 +353,7 @@ dnslib_zone_t *dnslib_zone_load(const char *filename)
malloc(sizeof(dnslib_dname_t *) *
(node_count + nsec3_node_count + 1));
printf("loading %u nodes\n", node_count);
debug_zp("loading %u nodes\n", node_count);
for (uint i = 1; i < (node_count + nsec3_node_count + 1); i++) {
id_array[i] = malloc(sizeof(dnslib_dname_t));
......@@ -385,7 +383,7 @@ dnslib_zone_t *dnslib_zone_load(const char *filename)
}
}
printf("loading %u nsec3 nodes\n", nsec3_node_count);
debug_zp("loading %u nsec3 nodes\n", nsec3_node_count);
for (uint i = 0; i < nsec3_node_count; i++) {
tmp_node = dnslib_load_node(f);
......
This diff is collapsed.
......@@ -52,7 +52,7 @@ struct lex_data {
typedef void namedb_type;
struct rrsig_list {
dnslib_rrset_t *data;
dnslib_rrsig_set_t *data;
struct rrsig_list *next;
};
......@@ -82,13 +82,13 @@ struct zparser {
dnslib_rrset_t current_rrset;
dnslib_rdata_item_t *temporary_items;
skip_list_t *rrsig_orphans;
rrsig_list_t *rrsig_orphans;
dnslib_dname_t *root_domain;
slab_cache_t *parser_slab;
dnslib_rrset_t *last_rrsig;
dnslib_rrsig_set_t *last_rrsig;
int rdata_count;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment