From 629073f630ea518f65a87ddb580333f03890377c Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Mon, 10 Jul 2017 14:24:00 +0200 Subject: [PATCH] rec: print records and sigs in negcache dump --- pdns/recursordist/negcache.cc | 6 ++++++ pdns/recursordist/test-negcache_cc.cc | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/pdns/recursordist/negcache.cc b/pdns/recursordist/negcache.cc index 49f4e2448..662341dd9 100644 --- a/pdns/recursordist/negcache.cc +++ b/pdns/recursordist/negcache.cc @@ -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(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(ne.d_ttd - now), sig.d_content->getZoneRepresentation().c_str()); + } } return ret; } diff --git a/pdns/recursordist/test-negcache_cc.cc b/pdns/recursordist/test-negcache_cc.cc index 734088470..bc25c3a5c 100644 --- a/pdns/recursordist/test-negcache_cc.cc +++ b/pdns/recursordist/test-negcache_cc.cc @@ -336,7 +336,11 @@ BOOST_AUTO_TEST_CASE(test_dumpToFile) { NegCache cache; vector 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); -- 2.40.0