Skip to content
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

Jump to bottom

Add more information to recursor cache dumps #5511

Merged
merged 4 commits into from Jul 17, 2017
Merged

Add more information to recursor cache dumps #5511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d50e9bc
rec: Dump RRSIGs from record cache
pieterlexis Jul 10, 2017
5ddf6eb
rec: Show validation state in recursor cache dump
pieterlexis Jul 10, 2017
ea9831c
rec: Show auth state recursor cache dump
pieterlexis Jul 10, 2017
629073f
rec: print records and sigs in negcache dump
pieterlexis Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion pdns/recursor_cache.cc
View file
Open in desktop
Expand Up @@ -450,7 +450,16 @@ uint64_t MemRecursorCache::doDump(int fd)
for(const auto j : i.d_records) {
count++;
try {
fprintf(fp, "%s %" PRId64 " IN %s %s ; %s\n", i.d_qname.toString().c_str(), static_cast<int64_t>(i.d_ttd - now), DNSRecordContent::NumberToType(i.d_qtype).c_str(), j->getZoneRepresentation().c_str(), i.d_netmask.empty() ? "" : i.d_netmask.toString().c_str());
fprintf(fp, "%s %" PRId64 " IN %s %s ; (%s) auth=%i %s\n", i.d_qname.toString().c_str(), static_cast<int64_t>(i.d_ttd - now), DNSRecordContent::NumberToType(i.d_qtype).c_str(), j->getZoneRepresentation().c_str(), vStates[i.d_state], i.d_auth, i.d_netmask.empty() ? "" : i.d_netmask.toString().c_str());
}
catch(...) {
fprintf(fp, "; error printing '%s'\n", i.d_qname.empty() ? "EMPTY" : i.d_qname.toString().c_str());
}
}
for(const auto &sig : i.d_signatures) {
count++;
try {
fprintf(fp, "%s %" PRId64 " IN RRSIG %s ; %s\n", i.d_qname.toString().c_str(), static_cast<int64_t>(i.d_ttd - now), sig->getZoneRepresentation().c_str(), i.d_netmask.empty() ? "" : i.d_netmask.toString().c_str());
}
catch(...) {
fprintf(fp, "; error printing '%s'\n", i.d_qname.empty() ? "EMPTY" : i.d_qname.toString().c_str());
Expand Down
6 changes: 6 additions & 0 deletions pdns/recursordist/negcache.cc
View file
Open in desktop
Expand Up @@ -170,6 +170,12 @@ uint64_t NegCache::dumpToFile(FILE* fp) {
for(const NegCacheEntry& ne : sidx) {
ret++;
fprintf(fp, "%s %d IN %s VIA %s\n", ne.d_name.toString().c_str(), (unsigned int) (ne.d_ttd - now), ne.d_qtype.getName().c_str(), ne.d_auth.toString().c_str());
for (const auto& rec : ne.DNSSECRecords.records) {
fprintf(fp, "%s %" PRId64 " IN %s %s ; (%s)\n", ne.d_name.toString().c_str(), static_cast<int64_t>(ne.d_ttd - now), DNSRecordContent::NumberToType(ne.d_qtype.getCode()).c_str(), rec.d_content->getZoneRepresentation().c_str(), vStates[ne.d_validationState]);
}
for (const auto& sig : ne.DNSSECRecords.signatures) {
fprintf(fp, "%s %" PRId64 " IN RRSIG %s ;\n", ne.d_name.toString().c_str(), static_cast<int64_t>(ne.d_ttd - now), sig.d_content->getZoneRepresentation().c_str());
}
}
return ret;
}
4 changes: 4 additions & 0 deletions pdns/recursordist/test-negcache_cc.cc
View file
Open in desktop
Expand Up @@ -336,7 +336,11 @@ BOOST_AUTO_TEST_CASE(test_dumpToFile) {
NegCache cache;
vector<string> expected;
expected.push_back("www1.powerdns.com. 600 IN TYPE0 VIA powerdns.com.\n");
expected.push_back("www1.powerdns.com. 600 IN ENT deadbeef. ; (Indeterminate)\n");
expected.push_back("www1.powerdns.com. 600 IN RRSIG NSEC 5 3 600 21000101000000 21000101000000 24567 dummy. data ;\n");
expected.push_back("www2.powerdns.com. 600 IN TYPE0 VIA powerdns.com.\n");
expected.push_back("www2.powerdns.com. 600 IN ENT deadbeef. ; (Indeterminate)\n");
expected.push_back("www2.powerdns.com. 600 IN RRSIG NSEC 5 3 600 21000101000000 21000101000000 24567 dummy. data ;\n");

struct timeval now;
Utility::gettimeofday(&now, 0);
Expand Down