BIND 10 master, updated. c30cd00cf1afde68776d7320cb283a8f9a911163 Merge branch 'master' into trac502-fix-author
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jan 26 03:22:25 UTC 2011
The branch, master has been updated
via c30cd00cf1afde68776d7320cb283a8f9a911163 (commit)
via 749c26e2c6cdc98abf0f7d6dc693acf122e5d9f5 (commit)
via a5bd8c03942d981b01fb0be3f8ea54ebcd960945 (commit)
via 1133c5a571d5bbddaeb44c2313cce75ebd624eeb (commit)
via 1243b751048365abdb5cec845a92674e0469b7b4 (commit)
via f9ceab26e3c573ccdabff7658b8221fbbe9a6122 (commit)
via 66ace85fab74d0c2d5760f1d01a40e440161ddb7 (commit)
from 6f6f5892046cb552bf334d2e5f84cf575dde3da5 (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 c30cd00cf1afde68776d7320cb283a8f9a911163
Merge: 749c26e2c6cdc98abf0f7d6dc693acf122e5d9f5 6f6f5892046cb552bf334d2e5f84cf575dde3da5
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date: Wed Jan 26 09:53:59 2011 +0800
Merge branch 'master' into trac502-fix-author
commit 749c26e2c6cdc98abf0f7d6dc693acf122e5d9f5
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date: Tue Jan 25 18:20:57 2011 +0100
fix unittest
commit a5bd8c03942d981b01fb0be3f8ea54ebcd960945
Merge: 1133c5a571d5bbddaeb44c2313cce75ebd624eeb 748885cd80a12aad0f02fc7b53943c2620d9eb22
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date: Tue Jan 25 18:18:44 2011 +0100
merge #502 : iterate over RRs
commit 1133c5a571d5bbddaeb44c2313cce75ebd624eeb
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Jan 25 10:12:30 2011 +0100
[trac502] Propose minor changes
commit 1243b751048365abdb5cec845a92674e0469b7b4
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date: Tue Jan 25 11:17:55 2011 +0800
update according to review comment : combine findAny and find logic
commit f9ceab26e3c573ccdabff7658b8221fbbe9a6122
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date: Fri Jan 21 15:07:50 2011 +0800
fix comments
commit 66ace85fab74d0c2d5760f1d01a40e440161ddb7
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date: Thu Jan 20 19:22:30 2011 +0800
iterate over RRs
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/query.cc | 5 +-
src/bin/auth/tests/query_unittest.cc | 14 +++-
src/lib/datasrc/memory_datasrc.cc | 20 +++++-
src/lib/datasrc/memory_datasrc.h | 7 ++-
src/lib/datasrc/static_datasrc.h | 6 +-
src/lib/datasrc/tests/memory_datasrc_unittest.cc | 82 +++++++++++++++++----
src/lib/datasrc/zone.h | 9 +++
7 files changed, 116 insertions(+), 27 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/query.cc b/src/bin/auth/query.cc
index cb7e3e0..4ecc75e 100644
--- a/src/bin/auth/query.cc
+++ b/src/bin/auth/query.cc
@@ -66,7 +66,8 @@ Query::findAddrs(const Zone& zone, const Name& qname,
// Find A rrset
if (qname_ != qname || qtype_ != RRType::A()) {
- Zone::FindResult a_result = zone.find(qname, RRType::A(), options);
+ Zone::FindResult a_result = zone.find(qname, RRType::A(), NULL,
+ options);
if (a_result.code == Zone::SUCCESS) {
response_.addRRset(Message::SECTION_ADDITIONAL,
boost::const_pointer_cast<RRset>(a_result.rrset));
@@ -76,7 +77,7 @@ Query::findAddrs(const Zone& zone, const Name& qname,
// Find AAAA rrset
if (qname_ != qname || qtype_ != RRType::AAAA()) {
Zone::FindResult aaaa_result =
- zone.find(qname, RRType::AAAA(), options);
+ zone.find(qname, RRType::AAAA(), NULL, options);
if (aaaa_result.code == Zone::SUCCESS) {
response_.addRRset(Message::SECTION_ADDITIONAL,
boost::const_pointer_cast<RRset>(aaaa_result.rrset));
diff --git a/src/bin/auth/tests/query_unittest.cc b/src/bin/auth/tests/query_unittest.cc
index 4a1d42b..45fa08b 100644
--- a/src/bin/auth/tests/query_unittest.cc
+++ b/src/bin/auth/tests/query_unittest.cc
@@ -104,6 +104,7 @@ public:
virtual const isc::dns::RRClass& getClass() const { return (rrclass_); }
virtual FindResult find(const isc::dns::Name& name,
const isc::dns::RRType& type,
+ RRsetList* target = NULL,
const FindOptions options = FIND_DEFAULT) const;
// If false is passed, it makes the zone broken as if it didn't have the
@@ -136,7 +137,7 @@ private:
Zone::FindResult
MockZone::find(const Name& name, const RRType& type,
- const FindOptions options) const
+ RRsetList* target, const FindOptions options) const
{
// Emulating a broken zone: mandatory apex RRs are missing if specifically
// configured so (which are rare cases).
@@ -166,7 +167,16 @@ MockZone::find(const Name& name, const RRType& type,
}
// If not found but the qtype is ANY, return the first RRset
- if (type == RRType::ANY()) {
+ if (!found_domain->second.empty() && type == RRType::ANY()) {
+ for (found_rrset = found_domain->second.begin();
+ found_rrset != found_domain->second.end(); found_rrset++)
+ {
+ // Insert RRs under the domain name into target
+ if (target) {
+ target->addRRset(
+ boost::const_pointer_cast<RRset>(found_rrset->second));
+ }
+ }
return (FindResult(SUCCESS, found_domain->second.begin()->second));
}
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index bd5a5e2..f0b8b53 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -19,6 +19,7 @@
#include <dns/name.h>
#include <dns/rrclass.h>
+#include <dns/rrsetlist.h>
#include <dns/masterload.h>
#include <datasrc/memory_datasrc.h>
@@ -213,9 +214,10 @@ struct MemoryZone::MemoryZoneImpl {
return (false);
}
+
// Implementation of MemoryZone::find
FindResult find(const Name& name, RRType type,
- const FindOptions options) const
+ RRsetList* target, const FindOptions options) const
{
// Get the node
DomainNode* node(NULL);
@@ -250,6 +252,18 @@ struct MemoryZone::MemoryZoneImpl {
}
}
+ // handle type any query
+ if (target && !node->getData()->empty()) {
+ // Empty domain will be handled as NXRRSET by normal processing
+ for (found = node->getData()->begin();
+ found != node->getData()->end(); found++)
+ {
+ target->addRRset(
+ boost::const_pointer_cast<RRset>(found->second));
+ }
+ return (FindResult(SUCCESS, ConstRRsetPtr()));
+ }
+
found = node->getData()->find(type);
if (found != node->getData()->end()) {
// Good, it is here
@@ -287,9 +301,9 @@ MemoryZone::getClass() const {
Zone::FindResult
MemoryZone::find(const Name& name, const RRType& type,
- const FindOptions options) const
+ RRsetList* target, const FindOptions options) const
{
- return (impl_->find(name, type, options));
+ return (impl_->find(name, type, target, options));
}
result::Result
diff --git a/src/lib/datasrc/memory_datasrc.h b/src/lib/datasrc/memory_datasrc.h
index 6939208..5a2c74e 100644
--- a/src/lib/datasrc/memory_datasrc.h
+++ b/src/lib/datasrc/memory_datasrc.h
@@ -22,6 +22,7 @@
namespace isc {
namespace dns {
class Name;
+class RRsetList;
};
namespace datasrc {
@@ -55,16 +56,20 @@ public:
/// \brief Returns the origin of the zone.
virtual const isc::dns::Name& getOrigin() const;
+
/// \brief Returns the class of the zone.
virtual const isc::dns::RRClass& getClass() const;
+
/// \brief Looks up an RRset in the zone.
///
/// See documentation in \c Zone.
///
- /// It returns NULL pointer in case of NXDOMAIN and NXRRSET
+ /// It returns NULL pointer in case of NXDOMAIN and NXRRSET,
+ /// and also SUCCESS if target is not NULL(TYPE_ANY query).
/// (the base class documentation does not seem to require that).
virtual FindResult find(const isc::dns::Name& name,
const isc::dns::RRType& type,
+ isc::dns::RRsetList* target = NULL,
const FindOptions options = FIND_DEFAULT) const;
/// \brief Inserts an rrset into the zone.
diff --git a/src/lib/datasrc/static_datasrc.h b/src/lib/datasrc/static_datasrc.h
index c6b2d8e..4d212fe 100644
--- a/src/lib/datasrc/static_datasrc.h
+++ b/src/lib/datasrc/static_datasrc.h
@@ -74,9 +74,9 @@ public:
isc::dns::Name& target,
const isc::dns::Name* zonename) const;
- Result findCoveringNSEC3(const isc::dns::Name& zonename,
- std::string& hash,
- isc::dns::RRsetList& target) const;
+ Result findCoveringNSEC3(const isc::dns::Name& zonename,
+ std::string& hash,
+ isc::dns::RRsetList& target) const;
Result init();
Result init(isc::data::ConstElementPtr config);
diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index 7154e12..8d1703d 100644
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -18,6 +18,7 @@
#include <dns/rdata.h>
#include <dns/rdataclass.h>
#include <dns/rrclass.h>
+#include <dns/rrsetlist.h>
#include <dns/rrttl.h>
#include <dns/masterload.h>
@@ -219,7 +220,8 @@ public:
void findTest(const Name& name, const RRType& rrtype, Zone::Result result,
bool check_answer = true,
const ConstRRsetPtr& answer = ConstRRsetPtr(),
- MemoryZone *zone = NULL,
+ RRsetList* target = NULL,
+ MemoryZone* zone = NULL,
Zone::FindOptions options = Zone::FIND_DEFAULT)
{
if (!zone) {
@@ -228,7 +230,7 @@ public:
// The whole block is inside, because we need to check the result and
// we can't assign to FindResult
EXPECT_NO_THROW({
- Zone::FindResult find_result(zone->find(name, rrtype,
+ Zone::FindResult find_result(zone->find(name, rrtype, target,
options));
// Check it returns correct answers
EXPECT_EQ(result, find_result.code);
@@ -312,7 +314,8 @@ TEST_F(MemoryZoneTest, findCNAMEUnderZoneCut) {
RRTTL(300)));
EXPECT_EQ(SUCCESS, zone_.add(rr_cname_under_cut_));
findTest(Name("cname.child.example.org"), RRType::AAAA(),
- Zone::CNAME, true, rr_cname_under_cut_, NULL, Zone::FIND_GLUE_OK);
+ Zone::CNAME, true, rr_cname_under_cut_, NULL, NULL,
+ Zone::FIND_GLUE_OK);
}
// Test adding child zones and zone cut handling
@@ -343,6 +346,51 @@ TEST_F(MemoryZoneTest, delegationNS) {
Zone::DELEGATION, true, rr_child_ns_); // note: !rr_grandchild_ns_
}
+TEST_F(MemoryZoneTest, findAny) {
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_a_)));
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_ns_)));
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_child_glue_)));
+
+ // origin
+ RRsetList origin_rrsets;
+ findTest(origin_, RRType::ANY(), Zone::SUCCESS, true,
+ ConstRRsetPtr(), &origin_rrsets);
+ EXPECT_EQ(2, origin_rrsets.size());
+ EXPECT_EQ(rr_a_, origin_rrsets.findRRset(RRType::A(), RRClass::IN()));
+ EXPECT_EQ(rr_ns_, origin_rrsets.findRRset(RRType::NS(), RRClass::IN()));
+
+ // out zone name
+ RRsetList out_rrsets;
+ findTest(Name("example.com"), RRType::ANY(), Zone::NXDOMAIN, true,
+ ConstRRsetPtr(), &out_rrsets);
+ EXPECT_EQ(0, out_rrsets.size());
+
+ RRsetList glue_child_rrsets;
+ findTest(child_glue_name_, RRType::ANY(), Zone::SUCCESS, true,
+ ConstRRsetPtr(), &glue_child_rrsets);
+ EXPECT_EQ(rr_child_glue_, glue_child_rrsets.findRRset(RRType::A(),
+ RRClass::IN()));
+ EXPECT_EQ(1, glue_child_rrsets.size());
+
+ // TODO: test NXRRSET case after rbtree non-terminal logic has
+ // been implemented
+
+ // add zone cut
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_child_ns_)));
+
+ // zone cut
+ RRsetList child_rrsets;
+ findTest(child_ns_name_, RRType::ANY(), Zone::DELEGATION, true,
+ rr_child_ns_, &child_rrsets);
+ EXPECT_EQ(0, child_rrsets.size());
+
+ // glue for this zone cut
+ RRsetList new_glue_child_rrsets;
+ findTest(child_glue_name_, RRType::ANY(), Zone::DELEGATION, true,
+ rr_child_ns_, &new_glue_child_rrsets);
+ EXPECT_EQ(0, new_glue_child_rrsets.size());
+}
+
TEST_F(MemoryZoneTest, glue) {
// install zone data:
// a zone cut
@@ -361,15 +409,15 @@ TEST_F(MemoryZoneTest, glue) {
// If we do it in the "glue OK" mode, we should find the exact match.
findTest(child_glue_name_, RRType::A(), Zone::SUCCESS, true,
- rr_child_glue_, NULL, Zone::FIND_GLUE_OK);
+ rr_child_glue_, NULL, NULL, Zone::FIND_GLUE_OK);
// glue OK + NXRRSET case
findTest(child_glue_name_, RRType::AAAA(), Zone::NXRRSET, true,
- ConstRRsetPtr(), NULL, Zone::FIND_GLUE_OK);
+ ConstRRsetPtr(), NULL, NULL, Zone::FIND_GLUE_OK);
// glue OK + NXDOMAIN case
findTest(Name("www.child.example.org"), RRType::A(), Zone::DELEGATION,
- true, rr_child_ns_, NULL, Zone::FIND_GLUE_OK);
+ true, rr_child_ns_, NULL, NULL, Zone::FIND_GLUE_OK);
// TODO:
// glue name would match a wildcard under a zone cut: wildcard match
@@ -378,12 +426,13 @@ TEST_F(MemoryZoneTest, glue) {
// nested cut case. The glue should be found.
findTest(grandchild_glue_name_, RRType::AAAA(), Zone::SUCCESS,
- true, rr_grandchild_glue_, NULL, Zone::FIND_GLUE_OK);
+ true, rr_grandchild_glue_, NULL, NULL, Zone::FIND_GLUE_OK);
// A non-existent name in nested cut. This should result in delegation
// at the highest zone cut.
findTest(Name("www.grand.child.example.org"), RRType::TXT(),
- Zone::DELEGATION, true, rr_child_ns_, NULL, Zone::FIND_GLUE_OK);
+ Zone::DELEGATION, true, rr_child_ns_, NULL, NULL,
+ Zone::FIND_GLUE_OK);
}
// Test adding DNAMEs and resulting delegation handling
@@ -442,14 +491,14 @@ TEST_F(MemoryZoneTest, load) {
// Now see there are some rrsets (we don't look inside, though)
findTest(Name("."), RRType::SOA(), Zone::SUCCESS, false, ConstRRsetPtr(),
- &rootzone);
+ NULL, &rootzone);
findTest(Name("."), RRType::NS(), Zone::SUCCESS, false, ConstRRsetPtr(),
- &rootzone);
+ NULL, &rootzone);
findTest(Name("a.root-servers.net."), RRType::A(), Zone::SUCCESS, false,
- ConstRRsetPtr(), &rootzone);
+ ConstRRsetPtr(), NULL, &rootzone);
// But this should no longer be here
findTest(ns_name_, RRType::AAAA(), Zone::NXDOMAIN, true, ConstRRsetPtr(),
- &rootzone);
+ NULL, &rootzone);
// Try loading zone that is wrong in a different way
EXPECT_THROW(zone_.load(TEST_DATA_DIR "/duplicate_rrset.zone"),
@@ -478,13 +527,13 @@ TEST_F(MemoryZoneTest, swap) {
EXPECT_EQ(RRClass::IN(), zone2.getClass());
// make sure the zone data is swapped, too
findTest(origin_, RRType::NS(), Zone::NXDOMAIN, false, ConstRRsetPtr(),
- &zone1);
+ NULL, &zone1);
findTest(other_origin, RRType::TXT(), Zone::SUCCESS, false,
- ConstRRsetPtr(), &zone1);
+ ConstRRsetPtr(), NULL, &zone1);
findTest(origin_, RRType::NS(), Zone::SUCCESS, false, ConstRRsetPtr(),
- &zone2);
+ NULL, &zone2);
findTest(other_origin, RRType::TXT(), Zone::NXDOMAIN, false,
- ConstRRsetPtr(), &zone2);
+ ConstRRsetPtr(), NULL, &zone2);
}
TEST_F(MemoryZoneTest, getFileName) {
@@ -510,4 +559,5 @@ TEST_F(MemoryZoneTest, getFileName) {
EXPECT_EQ(TEST_DATA_DIR "/root.zone", zone_.getFileName());
EXPECT_TRUE(rootzone.getFileName().empty());
}
+
}
diff --git a/src/lib/datasrc/zone.h b/src/lib/datasrc/zone.h
index bc03cdd..bf8ad05 100644
--- a/src/lib/datasrc/zone.h
+++ b/src/lib/datasrc/zone.h
@@ -17,6 +17,7 @@
#define __ZONE_H 1
#include <datasrc/result.h>
+#include <dns/rrsetlist.h>
namespace isc {
namespace datasrc {
@@ -162,6 +163,9 @@ public:
/// a successful match, and the code of \c SUCCESS will be returned.
/// - If the search name matches a delegation point of DNAME, it returns
/// the code of \c DNAME and that DNAME RR.
+ /// - If the target isn't NULL, all RRsets under the domain are inserted
+ /// there and SUCCESS (or NXDOMAIN, in case of empty domain) is returned
+ /// instead of normall processing. This is intended to handle ANY query.
///
/// The \c options parameter specifies customized behavior of the search.
/// Their semantics is as follows:
@@ -177,6 +181,8 @@ public:
/// A derived version of this method may involve internal resource
/// allocation, especially for constructing the resulting RRset, and may
/// throw an exception if it fails.
+ /// It throws DuplicateRRset exception if there are duplicate rrsets under
+ /// the same domain.
/// It should not throw other types of exceptions.
///
/// Note: It's quite likely that we'll need to specify search options.
@@ -186,10 +192,13 @@ public:
///
/// \param name The domain name to be searched for.
/// \param type The RR type to be searched for.
+ /// \param target If target is not NULL, insert all RRs under the domain
+ /// into it.
/// \param options The search options.
/// \return A \c FindResult object enclosing the search result (see above).
virtual FindResult find(const isc::dns::Name& name,
const isc::dns::RRType& type,
+ isc::dns::RRsetList* target = NULL,
const FindOptions options
= FIND_DEFAULT) const = 0;
//@}
More information about the bind10-changes
mailing list