BIND 10 trac1747, updated. c0c59aceac2afeec9ae3e2711b21e177046b9db3 [1747] cleanups
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Mar 9 13:55:07 UTC 2012
The branch, trac1747 has been updated
via c0c59aceac2afeec9ae3e2711b21e177046b9db3 (commit)
from 460facf264d8a653a959013ce6d7c25875695bc3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c0c59aceac2afeec9ae3e2711b21e177046b9db3
Author: Jelte Jansen <jelte at isc.org>
Date: Fri Mar 9 14:55:01 2012 +0100
[1747] cleanups
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/query.cc | 82 ++++++++++++++++++++++--------------------------
src/bin/auth/query.h | 18 +++++++---
2 files changed, 50 insertions(+), 50 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/query.cc b/src/bin/auth/query.cc
index bc4d25d..5e2935e 100644
--- a/src/bin/auth/query.cc
+++ b/src/bin/auth/query.cc
@@ -103,8 +103,8 @@ Query::addSOA(ZoneFinder& finder) {
* The const-cast is wrong, but the Message interface seems
* to insist.
*/
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- soa_ctx->rrset));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ soa_ctx->rrset));
}
}
@@ -123,7 +123,7 @@ Query::addNXDOMAINProofByNSEC(ZoneFinder& finder, ConstRRsetPtr nsec) {
}
// Add the NSEC proving NXDOMAIN to the authority section.
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(nsec));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(nsec));
// Next, identify the best possible wildcard name that would match
// the query name. It's the longer common suffix with the qname
@@ -160,8 +160,8 @@ Query::addNXDOMAINProofByNSEC(ZoneFinder& finder, ConstRRsetPtr nsec) {
// stage of performance optimization, we should consider optimizing this
// for some optimized data source implementations.
if (nsec->getName() != fcontext->rrset->getName()) {
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- fcontext->rrset));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ fcontext->rrset));
}
}
@@ -181,12 +181,12 @@ Query::addClosestEncloserProof(ZoneFinder& finder, const Name& name,
}
if (add_closest) {
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- result.closest_proof));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ result.closest_proof));
}
if (result.next_proof) {
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- result.next_proof));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ result.next_proof));
}
return (result.closest_labels);
}
@@ -202,8 +202,8 @@ Query::addNSEC3ForName(ZoneFinder& finder, const Name& name, bool match) {
<< (result.matched ? "matching" : "covering")
<< " NSEC3 found for " << name);
}
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- result.closest_proof));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ result.closest_proof));
}
void
@@ -238,8 +238,8 @@ Query::addWildcardProof(ZoneFinder& finder,
isc_throw(BadNSEC,
"Unexpected NSEC result for wildcard proof");
}
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- fcontext->rrset));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ fcontext->rrset));
} else if (db_context.isNSEC3Signed()) {
// Case for RFC 5155 Section 7.2.6.
//
@@ -269,8 +269,8 @@ Query::addWildcardNXRRSETProof(ZoneFinder& finder, ConstRRsetPtr nsec) {
if (nsec->getName() != fcontext->rrset->getName()) {
// one NSEC RR proves wildcard_nxrrset that no matched QNAME.
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- fcontext->rrset));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ fcontext->rrset));
}
}
@@ -279,8 +279,8 @@ Query::addDS(ZoneFinder& finder, const Name& dname) {
ConstZoneFinderContextPtr ds_context =
finder.find(dname, RRType::DS(), dnssec_opt_);
if (ds_context->code == ZoneFinder::SUCCESS) {
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- ds_context->rrset));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ ds_context->rrset));
} else if (ds_context->code == ZoneFinder::NXRRSET &&
ds_context->isNSECSigned()) {
addNXRRsetProof(finder, *ds_context);
@@ -299,8 +299,8 @@ Query::addNXRRsetProof(ZoneFinder& finder,
const ZoneFinder::Context& db_context)
{
if (db_context.isNSECSigned() && db_context.rrset) {
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- db_context.rrset));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ db_context.rrset));
if (db_context.isWildcard()) {
addWildcardNXRRSETProof(finder, db_context.rrset);
}
@@ -339,8 +339,8 @@ Query::addAuthAdditional(ZoneFinder& finder,
isc_throw(NoApexNS, "There's no apex NS records in zone " <<
finder.getOrigin().toText());
}
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- ns_context->rrset));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ ns_context->rrset));
getAdditional(qname_, qtype_, *ns_context, additionals);
}
@@ -369,6 +369,7 @@ Query::process(datasrc::DataSourceClient& datasrc_client,
// seems prudent, just in case a previous process() left
// data in here.
reset();
+
// Set up query parameters for the rest of the (internal) methods
initialize(datasrc_client, qname, qtype, response, dnssec);
@@ -406,7 +407,7 @@ Query::process(datasrc::DataSourceClient& datasrc_client,
const bool qtype_is_any = (qtype_ == RRType::ANY());
if (qtype_is_any) {
find = boost::bind(&ZoneFinder::findAll, &zfinder, qname_,
- boost::ref(answer_), dnssec_opt_);
+ boost::ref(answers_), dnssec_opt_);
} else {
find = boost::bind(&ZoneFinder::find, &zfinder, qname_, qtype_,
dnssec_opt_);
@@ -415,8 +416,8 @@ Query::process(datasrc::DataSourceClient& datasrc_client,
switch (db_context->code) {
case ZoneFinder::DNAME: {
// First, put the dname into the answer
- answer_.push_back(boost::const_pointer_cast<AbstractRRset>(
- db_context->rrset));
+ answers_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ db_context->rrset));
/*
* Empty DNAME should never get in, as it is impossible to
* create one in master file.
@@ -452,7 +453,7 @@ Query::process(datasrc::DataSourceClient& datasrc_client,
qname_.getLabelCount() -
db_context->rrset->getName().getLabelCount()).
concatenate(dname.getDname())));
- answer_.push_back(cname);
+ answers_.push_back(cname);
break;
}
case ZoneFinder::CNAME:
@@ -465,8 +466,8 @@ Query::process(datasrc::DataSourceClient& datasrc_client,
*
* So, just put it there.
*/
- answer_.push_back(boost::const_pointer_cast<AbstractRRset>(
- db_context->rrset));
+ answers_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ db_context->rrset));
// If the answer is a result of wildcard substitution,
// add a proof that there's no closer name.
@@ -475,17 +476,10 @@ Query::process(datasrc::DataSourceClient& datasrc_client,
}
break;
case ZoneFinder::SUCCESS:
- if (qtype_is_any) {
- // If quety type is ANY, insert all RRs under the domain
- // into answer section.
- // err THIS WILL FAIL
- //BOOST_FOREACH(ConstRRsetPtr rrset, answer_) {
- // answer_.push_back(
- // boost::const_pointer_cast<AbstractRRset>(rrset));
- //}
- } else {
- answer_.push_back(boost::const_pointer_cast<AbstractRRset>(
- db_context->rrset));
+ // If query type is ANY, the rrs have already been added
+ if (!qtype_is_any) {
+ answers_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ db_context->rrset));
}
// Retrieve additional records for the answer
@@ -520,8 +514,8 @@ Query::process(datasrc::DataSourceClient& datasrc_client,
}
response_->setHeaderFlag(Message::HEADERFLAG_AA, false);
- authority_.push_back(boost::const_pointer_cast<AbstractRRset>(
- db_context->rrset));
+ authorities_.push_back(boost::const_pointer_cast<AbstractRRset>(
+ db_context->rrset));
// Retrieve additional records for the name servers
db_context->getAdditional(A_AND_AAAA(), additionals_);
@@ -574,14 +568,14 @@ Query::initialize(datasrc::DataSourceClient& datasrc_client,
void
Query::createResponse() {
- for_each(answer_.begin(), answer_.end(),
+ for_each(answers_.begin(), answers_.end(),
RRsetInserter(*response_, Message::SECTION_ANSWER,
dnssec_));
- answer_.clear();
- for_each(authority_.begin(), authority_.end(),
+ answers_.clear();
+ for_each(authorities_.begin(), authorities_.end(),
RRsetInserter(*response_, Message::SECTION_AUTHORITY,
dnssec_));
- authority_.clear();
+ authorities_.clear();
for_each(additionals_.begin(), additionals_.end(),
RRsetInserter(*response_, Message::SECTION_ADDITIONAL,
dnssec_));
diff --git a/src/bin/auth/query.h b/src/bin/auth/query.h
index 5d3478a..1adfd8b 100644
--- a/src/bin/auth/query.h
+++ b/src/bin/auth/query.h
@@ -226,12 +226,18 @@ private:
void addNSEC3ForName(isc::datasrc::ZoneFinder& finder,
const isc::dns::Name& name, bool match);
-
/// Set up the Query object for a new query lookup
///
/// This is the first step of the process() method, and initializes
/// the member data
///
+ /// \param datasrc_client The datasource wherein the answer to the query is
+ /// to be found.
+ /// \param qname The query name
+ /// \param qtype The RR type of the query
+ /// \param response The response message to store the answer to the query.
+ /// \param dnssec If the answer should include signatures and NSEC/NSEC3 if
+ /// possible.
void initialize(datasrc::DataSourceClient& datasrc_client,
const isc::dns::Name qname, const isc::dns::RRType qtype,
isc::dns::Message& response, bool dnssec = false);
@@ -242,7 +248,7 @@ private:
/// that method, it should be called before it returns (if any
/// response data is to be added)
///
- /// This will take each RRset collected in answer_, authority_, and
+ /// This will take each RRset collected in answers_, authorities_, and
/// additionals_, and add them to their corresponding sections in
/// the response packet.
///
@@ -252,8 +258,8 @@ private:
/// \brief Resets any partly built response data
void
reset() {
- answer_.clear();
- authority_.clear();
+ answers_.clear();
+ authorities_.clear();
additionals_.clear();
}
@@ -383,8 +389,8 @@ private:
bool dnssec_;
isc::datasrc::ZoneFinder::FindOptions dnssec_opt_;
- std::vector<isc::dns::ConstRRsetPtr> answer_;
- std::vector<isc::dns::ConstRRsetPtr> authority_;
+ std::vector<isc::dns::ConstRRsetPtr> answers_;
+ std::vector<isc::dns::ConstRRsetPtr> authorities_;
std::vector<isc::dns::ConstRRsetPtr> additionals_;
};
More information about the bind10-changes
mailing list