From ad0ce258df14fa88a299ef37238d4c2527f273c8 Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Fri, 30 Mar 2012 15:01:35 -0700 Subject: [PATCH] [1579] editorial cleanup, mostly per the guidelines. - folded long lines - removed white space at EOL - spacing consistency. in particular, add one space after comma - alignment --- src/lib/datasrc/database.cc | 47 ++++++++++++---------- src/lib/datasrc/database.h | 6 ++- src/lib/datasrc/tests/database_unittest.cc | 37 +++++++++-------- 3 files changed, 47 insertions(+), 43 deletions(-) diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc index c85047abfd..493920bc87 100644 --- a/src/lib/datasrc/database.cc +++ b/src/lib/datasrc/database.cc @@ -374,7 +374,7 @@ FINAL_TYPES_NO_NSEC() { result.insert(RRType::CNAME()); result.insert(RRType::NS()); initialized = true; - } + } return (result); } @@ -425,14 +425,16 @@ DatabaseClient::Finder::findAll(const isc::dns::Name& name, { const bool need_nsec3 = (((options & FIND_DNSSEC) != 0) && isNSEC3()); if ((need_nsec3 == true) && (isNSEC() == true)){ - isc_throw(DataSourceError, "nsec and nsec3 coexist"); + isc_throw(DataSourceError, "nsec and nsec3 coexist"); } - // If the zone is signed with NSEC3, need to add RESULT_NSEC3_SIGNED to the flags - // in FindContext when NXRRSET NXDOMAIN or WILDCARD in the DNSSEC query, no need - // NSEC RRset at the same time. + // If the zone is signed with NSEC3, need to add RESULT_NSEC3_SIGNED to the + // flags in FindContext when NXRRSET NXDOMAIN or WILDCARD in the DNSSEC + // query, no need NSEC RRset at the same time. return (ZoneFinderContextPtr(new Context(*this, options, - findInternal(name, RRType::ANY(), &target, - options, need_nsec3),target))); + findInternal(name, RRType::ANY(), + &target, options, + need_nsec3), + target))); } ZoneFinderContextPtr @@ -443,16 +445,17 @@ DatabaseClient::Finder::find(const isc::dns::Name& name, if (type == RRType::ANY()) { isc_throw(isc::Unexpected, "Use findAll to answer ANY"); } - // If the zone is signed with NSEC3, need to add RESULT_NSEC3_SIGNED to the flags - // in FindContext when NXRRSET NXDOMAIN or WILDCARD in the DNSSEC query, no need - // NSEC RRset at the same time. + // If the zone is signed with NSEC3, need to add RESULT_NSEC3_SIGNED to the + // flags in FindContext when NXRRSET NXDOMAIN or WILDCARD in the DNSSEC + // query, no need NSEC RRset at the same time. const bool need_nsec3 = (((options & FIND_DNSSEC) != 0) && isNSEC3()); if ((need_nsec3 == true) && (isNSEC() == true)){ - isc_throw(DataSourceError, "nsec and nsec3 coexist"); + isc_throw(DataSourceError, "nsec and nsec3 coexist"); } return (ZoneFinderContextPtr(new Context(*this, options, - findInternal(name, type, - NULL, options,need_nsec3)))); + findInternal(name, type, NULL, + options, + need_nsec3)))); } DatabaseClient::Finder::DelegationSearchResult @@ -656,7 +659,7 @@ DatabaseClient::Finder::findWildcardMatch( DATASRC_DATABASE_WILDCARD_CANCEL_NS). arg(accessor_->getDBName()).arg(wildcard). arg(dresult.first_ns->getName()); - return (ResultContext(DELEGATION, dresult.first_ns)); + return (ResultContext(DELEGATION, dresult.first_ns)); } else if (!hasSubdomains(name.split(i - 1).toText())) { // The wildcard match is the best one, find the final result // at it. Note that wildcard should never be the zone origin. @@ -685,8 +688,9 @@ DatabaseClient::Finder::findWildcardMatch( RESULT_NSEC_SIGNED)); } } - return (ResultContext(NXRRSET, ConstRRsetPtr(), need_nsec3 ? - (RESULT_WILDCARD | RESULT_NSEC3_SIGNED) : RESULT_WILDCARD)); + return (ResultContext(NXRRSET, ConstRRsetPtr(), need_nsec3 ? + (RESULT_WILDCARD | RESULT_NSEC3_SIGNED) : + RESULT_WILDCARD)); } } @@ -737,7 +741,7 @@ DatabaseClient::Finder::findOnNameResult(const Name& name, const bool wild = (wildname != NULL); FindResultFlags flags; if (need_nsec3) { - flags = wild ? (RESULT_WILDCARD | RESULT_NSEC3_SIGNED) : + flags = wild ? (RESULT_WILDCARD | RESULT_NSEC3_SIGNED) : RESULT_DEFAULT; } else { flags = wild ? RESULT_WILDCARD : RESULT_DEFAULT; @@ -893,8 +897,7 @@ DatabaseClient::Finder::findNoNameResult(const Name& name, const RRType& type, } bool -DatabaseClient::Finder::isNSEC3() -{ +DatabaseClient::Finder::isNSEC3() { // If an NSEC3PARAM RR exists at the zone apex, it's quite likely that // the zone is signed with NSEC3. (If not the zone is more or less broken, // but it's caller's responsibility how to handle such cases). @@ -905,8 +908,7 @@ DatabaseClient::Finder::isNSEC3() } bool -DatabaseClient::Finder::isNSEC() -{ +DatabaseClient::Finder::isNSEC() { // If an NSEC RRsets exists at the zone apex, it's quite likely that // the zone is signed with NSEC. (If not the zone is more or less broken, // but it's caller's responsibility how to handle such cases) @@ -919,7 +921,8 @@ DatabaseClient::Finder::isNSEC() ZoneFinder::ResultContext DatabaseClient::Finder::findInternal(const Name& name, const RRType& type, std::vector* target, - const FindOptions options, const bool is_nsec3) + const FindOptions options, + const bool is_nsec3) { LOG_DEBUG(logger, DBG_TRACE_DETAILED, DATASRC_DATABASE_FIND_RECORDS) .arg(accessor_->getDBName()).arg(name).arg(type).arg(getClass()); diff --git a/src/lib/datasrc/database.h b/src/lib/datasrc/database.h index 6bffd80936..b9421ca8a4 100644 --- a/src/lib/datasrc/database.h +++ b/src/lib/datasrc/database.h @@ -712,11 +712,13 @@ public: /// searches the NSEC3PARAM RRset in the zone apex, if it exists, the /// zone looks signed with nsec3 bool isNSEC3(); + /// \brief check whether zone is signed with nsec /// - /// searches the NSEC RRset in the zone apex, if it exists, the + /// searches the NSEC RRset in the zone apex, if it exists, the /// zone looks signed with nsec bool isNSEC(); + /// \brief Find an RRset in the datasource /// /// Searches the datasource for an RRset of the given name and @@ -965,7 +967,7 @@ public: const isc::dns::RRType& type, const FindOptions options, const DelegationSearchResult& dresult, - std::vector* target, + std::vector* target, const bool need_nsec3); /// \brief Handle matching results for name diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc index 822ef3fd2d..eeb6643ba9 100644 --- a/src/lib/datasrc/tests/database_unittest.cc +++ b/src/lib/datasrc/tests/database_unittest.cc @@ -1460,7 +1460,7 @@ doFindAllTestResult(ZoneFinder& finder, const isc::dns::Name& name, const isc::dns::Name& expected_name = isc::dns::Name::ROOT_NAME(), const ZoneFinder::FindOptions options = - ZoneFinder::FIND_DEFAULT, + ZoneFinder::FIND_DEFAULT, ZoneFinder::FindResultFlags expected_flags = ZoneFinder::RESULT_DEFAULT) { @@ -2329,7 +2329,7 @@ TYPED_TEST(DatabaseClientTest, dbNegativeCaseFind) { "FAKEFAKEFAKE"); doFindTest(*finder, isc::dns::Name("b.a.wild.example.org"), isc::dns::RRType::A(), isc::dns::RRType::A(), - this->rrttl_, ZoneFinder::SUCCESS, this->expected_rdatas_, + this->rrttl_, ZoneFinder::SUCCESS, this->expected_rdatas_, this->expected_sig_rdatas_, (ZoneFinder::RESULT_WILDCARD | ZoneFinder::RESULT_NSEC_SIGNED), isc::dns::Name("b.a.wild.example.org"), ZoneFinder::FIND_DNSSEC); @@ -2356,11 +2356,11 @@ TYPED_TEST(DatabaseClientTest, dbNegativeCaseFind) { try { this->expected_rdatas_.clear(); this->expected_sig_rdatas_.clear(); - doFindTest(this->updater_->getFinder(), isc::dns::Name("www1.example.org."), - this->qtype_, this->qtype_, this->rrttl_, ZoneFinder::NXDOMAIN, - this->expected_rdatas_, this->expected_sig_rdatas_, - ZoneFinder::RESULT_NSEC3_SIGNED, isc::dns::Name::ROOT_NAME(), - ZoneFinder::FIND_DNSSEC); + doFindTest(this->updater_->getFinder(), Name("www1.example.org."), + this->qtype_, this->qtype_, this->rrttl_, + ZoneFinder::NXDOMAIN, this->expected_rdatas_, + this->expected_sig_rdatas_, ZoneFinder::RESULT_NSEC3_SIGNED, + Name::ROOT_NAME(), ZoneFinder::FIND_DNSSEC); } catch (const DataSourceError&) {} // The following test should be tested in zone which is signed by NSEC3 #if 0 @@ -2372,8 +2372,7 @@ TYPED_TEST(DatabaseClientTest, dbNegativeCaseFind) { // test. this->updater_ = this->client_->getUpdater(this->zname_, false); this->rrset_.reset(new RRset(this->zname_, this->qclass_, - isc::dns::RRType::NSEC3PARAM(), - this->rrttl_)); + RRType::NSEC3PARAM(), this->rrttl_)); this->rrset_->addRdata(rdata::createRdata(this->rrset_->getType(), this->rrset_->getClass(), "1 0 12 aabbccdd")); @@ -2384,13 +2383,13 @@ TYPED_TEST(DatabaseClientTest, dbNegativeCaseFind) { doFindTest(this->updater_->getFinder(), isc::dns::Name("www1.example.org."), this->qtype_, this->qtype_, this->rrttl_, ZoneFinder::NXDOMAIN, this->expected_rdatas_, - this->expected_sig_rdatas_, ZoneFinder::RESULT_NSEC3_SIGNED, + this->expected_sig_rdatas_, ZoneFinder::RESULT_NSEC3_SIGNED, isc::dns::Name::ROOT_NAME(), ZoneFinder::FIND_DNSSEC); // check NXRRSET this->expected_rdatas_.clear(); this->expected_sig_rdatas_.clear(); - doFindTest(this->updater_->getFinder(), isc::dns::Name("www.example.org."), - isc::dns::RRType::TXT(), isc::dns::RRType::TXT(), this->rrttl_, + doFindTest(this->updater_->getFinder(), Name("www.example.org."), + RRType::TXT(), RRType::TXT(), this->rrttl_, ZoneFinder::NXRRSET, this->expected_rdatas_, this->expected_sig_rdatas_, ZoneFinder::RESULT_NSEC3_SIGNED, isc::dns::Name::ROOT_NAME(), ZoneFinder::FIND_DNSSEC); @@ -2399,20 +2398,20 @@ TYPED_TEST(DatabaseClientTest, dbNegativeCaseFind) { this->expected_sig_rdatas_.push_back("A 5 3 3600 20000101000000 " "20000201000000 12345 example.org. " "FAKEFAKEFAKE"); - doFindTest(this->updater_->getFinder(), isc::dns::Name("b.a.wild.example.org"), + doFindTest(this->updater_->getFinder(), Name("b.a.wild.example.org"), this->qtype_, this->qtype_, this->rrttl_, ZoneFinder::SUCCESS, this->expected_rdatas_, this->expected_sig_rdatas_, ZoneFinder::RESULT_WILDCARD | ZoneFinder::RESULT_NSEC3_SIGNED, - isc::dns::Name::ROOT_NAME(), ZoneFinder::FIND_DNSSEC); + Name::ROOT_NAME(), ZoneFinder::FIND_DNSSEC); // check flags if NXRRSET in wildcard case this->expected_rdatas_.clear(); this->expected_sig_rdatas_.clear(); - doFindTest(this->updater_->getFinder(), isc::dns::Name("b.a.wild.example.org"), - isc::dns::RRType::TXT(), isc::dns::RRType::TXT(), - this->rrttl_, ZoneFinder::NXRRSET, this->expected_rdatas_, - this->empty_rdatas_, (ZoneFinder::RESULT_WILDCARD | + doFindTest(this->updater_->getFinder(), Name("b.a.wild.example.org"), + RRType::TXT(), RRType::TXT(), this->rrttl_, + ZoneFinder::NXRRSET, this->expected_rdatas_, + this->empty_rdatas_, (ZoneFinder::RESULT_WILDCARD | ZoneFinder::RESULT_NSEC3_SIGNED), - isc::dns::Name::ROOT_NAME(), ZoneFinder::FIND_DNSSEC); + Name::ROOT_NAME(), ZoneFinder::FIND_DNSSEC); #endif }