Skip to content

Remove assertions and skip on missing or broken rrname, bailiwick, rdata on nmsg files #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
regalk13 wants to merge 1 commit into
base: next
Choose a base branch
from
Open

Remove assertions and skip on missing or broken rrname, bailiwick, rdata on nmsg files #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions dnstable_convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ static uint64_t max_time_last_dnssec;

static struct timespec start_time;
static uint64_t count_messages;
static uint64_t count_skipped;
static uint64_t count_entries_dns;
static uint64_t count_entries_dnssec;
/* Count merged entries correctly even when MTBL multithreading is enabled. */
Expand Down Expand Up @@ -223,11 +224,12 @@ do_stats(void)
fd = dup(2);

fprintf(stderr, "processed "
"%'" PRIu64 " messages, "
"%'" PRIu64 " messages (%'" PRIu64 " skipped), "
"%'" PRIu64 " DNS entries, %'" PRIu64 " DNSSEC entries, %'" PRIu64 " merged "
"in %'.2f sec, %'d msg/sec, %'d ent/sec, fd=%d"
"\n",
count_messages,
count_skipped,
count_entries_dns,
count_entries_dnssec,
atomic_load_explicit(&count_entries_merged, memory_order_relaxed),
Expand Down Expand Up @@ -806,11 +808,16 @@ do_read(void)

dns = (Nmsg__Sie__DnsDedupe *) nmsg_message_get_payload(msg);
assert(dns != NULL);
assert(dns->has_rrname);
assert(dns->rrname.len < 256);
assert(dns->has_rrtype);
assert(dns->has_bailiwick);
assert(dns->n_rdata > 0);

if (!dns->has_rrname || dns->rrname.len == 0 ||
dns->rrname.len >= 256 ||
!dns->has_rrtype ||
!dns->has_bailiwick || dns->bailiwick.len == 0 ||
dns->n_rdata == 0) {
nmsg_message_destroy(&msg);
count_skipped += 1;
continue;
}

process_rrset(dns, key, val);
process_rrset_name_fwd(dns, key, val);
Expand Down