BIND 10 master, updated. 1170780af08a0de33e882da5409776fe0e7f2a11 Merge branch 'master' into trac2052
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Jul 3 01:53:17 UTC 2012
The branch, master has been updated
via 1170780af08a0de33e882da5409776fe0e7f2a11 (commit)
via dbef0e25199a8694e57e03fba704d5aa839ab3b7 (commit)
via 6b32945256d568825b2c0c07fd84d96efedd85bf (commit)
via 87e091a226590e11fea99cc16af4c03a25f0b840 (commit)
via c09a49cd3d1cd3498a7c7fb778abbe5485989e65 (commit)
via 491a0e2f9cd8a8c72bd9ae5c1650e523ca8afab9 (commit)
via 02f0aa67d53e253855814e88e885cf19e6dfdf96 (commit)
via 57c61f2f457ac99686706d05dda5cd39737c6bd0 (commit)
from 1a0fc96ac4cf6f324631e67ac391b85d6eec5b08 (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 1170780af08a0de33e882da5409776fe0e7f2a11
Merge: dbef0e2 1a0fc96
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jul 3 06:44:42 2012 +0530
Merge branch 'master' into trac2052
Conflicts:
src/lib/dns/name.cc
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/rbtree.h | 3 +
src/lib/dns/labelsequence.cc | 15 ++
src/lib/dns/labelsequence.h | 16 +-
src/lib/dns/name.cc | 56 ++++++-
src/lib/dns/name.h | 33 +++-
src/lib/dns/tests/labelsequence_unittest.cc | 217 +++++++++++++++++++++++++++
6 files changed, 329 insertions(+), 11 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/rbtree.h b/src/lib/datasrc/rbtree.h
index 39646ac..106aaa8 100644
--- a/src/lib/datasrc/rbtree.h
+++ b/src/lib/datasrc/rbtree.h
@@ -1260,6 +1260,9 @@ RBTree<T>::previousNode(RBTreeNodeChain<T>& node_path) const {
// already, which located the exact node. The rest of the function
// goes one domain left and returns it for us.
break;
+ default:
+ // This must not happen as Name::compare() never returns NONE.
+ isc_throw(isc::Unexpected, "Name::compare() returned unexpected result");
}
// So, the node_path now contains the path to a node we want previous for.
diff --git a/src/lib/dns/labelsequence.cc b/src/lib/dns/labelsequence.cc
index d6521e0..a9be6bc 100644
--- a/src/lib/dns/labelsequence.cc
+++ b/src/lib/dns/labelsequence.cc
@@ -71,6 +71,21 @@ LabelSequence::equals(const LabelSequence& other, bool case_sensitive) const {
return (true);
}
+NameComparisonResult
+LabelSequence::compare(const LabelSequence& other,
+ bool case_sensitive) const {
+ if (isAbsolute() ^ other.isAbsolute()) {
+ return (NameComparisonResult(0, 0, NameComparisonResult::NONE));
+ }
+
+ return (name_.compare(other.name_,
+ first_label_,
+ other.first_label_,
+ last_label_,
+ other.last_label_,
+ case_sensitive));
+}
+
void
LabelSequence::stripLeft(size_t i) {
if (i >= getLabelCount()) {
diff --git a/src/lib/dns/labelsequence.h b/src/lib/dns/labelsequence.h
index 12fb4f4..cf5495b 100644
--- a/src/lib/dns/labelsequence.h
+++ b/src/lib/dns/labelsequence.h
@@ -85,10 +85,10 @@ public:
/// \return The length of the data of the label sequence in octets.
size_t getDataLength() const;
- /// \brief Compares two label sequences.
+ /// \brief Compares two label sequences for equality.
///
/// Performs a (optionally case-insensitive) comparison between this
- /// LabelSequence and another LabelSequence.
+ /// LabelSequence and another LabelSequence for equality.
///
/// \param other The LabelSequence to compare with
/// \param case_sensitive If true, comparison is case-insensitive
@@ -96,6 +96,18 @@ public:
/// and contain the same data.
bool equals(const LabelSequence& other, bool case_sensitive = false) const;
+ /// \brief Compares two label sequences.
+ ///
+ /// Performs a (optionally case-insensitive) comparison between this
+ /// LabelSequence and another LabelSequence.
+ ///
+ /// \param other The LabelSequence to compare with
+ /// \param case_sensitive If true, comparison is case-insensitive
+ /// \return a <code>NameComparisonResult</code> object representing the
+ /// comparison result.
+ NameComparisonResult compare(const LabelSequence& other,
+ bool case_sensitive = false) const;
+
/// \brief Remove labels from the front of this LabelSequence
///
/// \note No actual memory is changed, this operation merely updates the
diff --git a/src/lib/dns/name.cc b/src/lib/dns/name.cc
index 5630435..a8b080c 100644
--- a/src/lib/dns/name.cc
+++ b/src/lib/dns/name.cc
@@ -507,13 +507,33 @@ Name::toText(bool omit_final_dot) const {
NameComparisonResult
Name::compare(const Name& other) const {
+ return (compare(other, 0, 0, labelcount_, other.labelcount_));
+}
+
+NameComparisonResult
+Name::compare(const Name& other,
+ unsigned int first_label,
+ unsigned int first_label_other,
+ unsigned int last_label,
+ unsigned int last_label_other,
+ bool case_sensitive) const {
// Determine the relative ordering under the DNSSEC order relation of
// 'this' and 'other', and also determine the hierarchical relationship
// of the names.
+ if ((first_label > last_label) ||
+ (first_label_other > last_label_other)) {
+ isc_throw(BadValue, "Bad label index ranges were passed");
+ }
+
+ if ((first_label > labelcount_) ||
+ (first_label_other > other.labelcount_)) {
+ isc_throw(BadValue, "Bad first label indices were passed");
+ }
+
unsigned int nlabels = 0;
- unsigned int l1 = labelcount_;
- unsigned int l2 = other.labelcount_;
+ int l1 = last_label - first_label;
+ int l2 = last_label_other - first_label_other;
int ldiff = (int)l1 - (int)l2;
unsigned int l = (ldiff < 0) ? l1 : l2;
@@ -521,8 +541,8 @@ Name::compare(const Name& other) const {
--l;
--l1;
--l2;
- size_t pos1 = offsets_[l1];
- size_t pos2 = other.offsets_[l2];
+ size_t pos1 = offsets_[l1 + first_label];
+ size_t pos2 = other.offsets_[l2 + first_label_other];
unsigned int count1 = ndata_[pos1++];
unsigned int count2 = other.ndata_[pos2++];
@@ -536,19 +556,39 @@ Name::compare(const Name& other) const {
while (count > 0) {
uint8_t label1 = ndata_[pos1];
uint8_t label2 = other.ndata_[pos2];
+ int chdiff;
+
+ if (case_sensitive) {
+ chdiff = (int)label1 - (int)label2;
+ } else {
+ chdiff = (int)maptolower[label1] - (int)maptolower[label2];
+ }
- int chdiff = (int)maptolower[label1] - (int)maptolower[label2];
if (chdiff != 0) {
- return (NameComparisonResult(chdiff, nlabels,
- NameComparisonResult::COMMONANCESTOR));
+ if ((nlabels == 0) &&
+ ((last_label < labelcount_) ||
+ (last_label_other < other.labelcount_))) {
+ return (NameComparisonResult(0, 0,
+ NameComparisonResult::NONE));
+ } else {
+ return (NameComparisonResult(chdiff, nlabels,
+ NameComparisonResult::COMMONANCESTOR));
+ }
}
--count;
++pos1;
++pos2;
}
if (cdiff != 0) {
+ if ((nlabels == 0) &&
+ ((last_label < labelcount_) ||
+ (last_label_other < other.labelcount_))) {
+ return (NameComparisonResult(0, 0,
+ NameComparisonResult::NONE));
+ } else {
return (NameComparisonResult(cdiff, nlabels,
- NameComparisonResult::COMMONANCESTOR));
+ NameComparisonResult::COMMONANCESTOR));
+ }
}
++nlabels;
}
diff --git a/src/lib/dns/name.h b/src/lib/dns/name.h
index 41024fc..6cfa546 100644
--- a/src/lib/dns/name.h
+++ b/src/lib/dns/name.h
@@ -142,7 +142,8 @@ public:
SUPERDOMAIN = 0,
SUBDOMAIN = 1,
EQUAL = 2,
- COMMONANCESTOR = 3
+ COMMONANCESTOR = 3,
+ NONE = 4
};
///
@@ -404,6 +405,36 @@ public:
/// comparison result.
NameComparisonResult compare(const Name& other) const;
+private:
+ /// \brief Partially compare two <code>Name</code>s.
+ ///
+ /// This method performs a partial comparison of the
+ /// <code>Name</code> and <code>other</code> and returns the result
+ /// in the form of a <code>NameComparisonResult</code> object.
+ ///
+ /// This method can throw the BadValue exception if bad label
+ /// indices are passed.
+ ///
+ /// \param other the right-hand operand to compare against.
+ /// \param first_label the left-most label of <code>Name</code> to
+ /// begin comparing from.
+ /// \param first_label_other the left-most label of
+ /// <code>other</code> to begin comparing from.
+ /// \param last_label the right-most label of <code>Name</code> to
+ /// end comparing at.
+ /// \param last_label_other the right-most label of
+ /// <code>other</code> to end comparing at.
+ /// \param case_sensitive If true, comparison is case-insensitive
+ /// \return a <code>NameComparisonResult</code> object representing the
+ /// comparison result.
+ NameComparisonResult compare(const Name& other,
+ unsigned int first_label,
+ unsigned int first_label_other,
+ unsigned int last_label,
+ unsigned int last_label_other,
+ bool case_sensitive = false) const;
+
+public:
/// \brief Return true iff two names are equal.
///
/// Semantically this could be implemented based on the result of the
diff --git a/src/lib/dns/tests/labelsequence_unittest.cc b/src/lib/dns/tests/labelsequence_unittest.cc
index 0e1fd5e..d1671a2 100644
--- a/src/lib/dns/tests/labelsequence_unittest.cc
+++ b/src/lib/dns/tests/labelsequence_unittest.cc
@@ -142,6 +142,223 @@ TEST_F(LabelSequenceTest, equals_insensitive) {
EXPECT_TRUE(ls11.equals(ls12));
}
+// Compare tests
+TEST_F(LabelSequenceTest, compare) {
+ // "example.org." and "example.org.", case sensitive
+ NameComparisonResult result = ls1.compare(ls3, true);
+ EXPECT_EQ(isc::dns::NameComparisonResult::EQUAL,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(3, result.getCommonLabels());
+
+ // "example.org." and "example.ORG.", case sensitive
+ result = ls3.compare(ls5, true);
+ EXPECT_EQ(isc::dns::NameComparisonResult::COMMONANCESTOR,
+ result.getRelation());
+ EXPECT_LT(0, result.getOrder());
+ EXPECT_EQ(1, result.getCommonLabels());
+
+ // "example.org." and "example.ORG.", case in-sensitive
+ result = ls3.compare(ls5);
+ EXPECT_EQ(isc::dns::NameComparisonResult::EQUAL,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(3, result.getCommonLabels());
+
+ Name na("a.example.org");
+ Name nb("b.example.org");
+ LabelSequence lsa(na);
+ LabelSequence lsb(nb);
+
+ // "a.example.org." and "b.example.org.", case in-sensitive
+ result = lsa.compare(lsb);
+ EXPECT_EQ(isc::dns::NameComparisonResult::COMMONANCESTOR,
+ result.getRelation());
+ EXPECT_GT(0, result.getOrder());
+ EXPECT_EQ(3, result.getCommonLabels());
+
+ // "example.org." and "b.example.org.", case in-sensitive
+ lsa.stripLeft(1);
+ result = lsa.compare(lsb);
+ EXPECT_EQ(isc::dns::NameComparisonResult::SUPERDOMAIN,
+ result.getRelation());
+ EXPECT_GT(0, result.getOrder());
+ EXPECT_EQ(3, result.getCommonLabels());
+
+ Name nc("g.f.e.d.c.example.org");
+ LabelSequence lsc(nc);
+
+ // "g.f.e.d.c.example.org." and "b.example.org" (not absolute), case
+ // in-sensitive
+ lsb.stripRight(1);
+ result = lsc.compare(lsb);
+ EXPECT_EQ(isc::dns::NameComparisonResult::NONE,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(0, result.getCommonLabels());
+
+ // "g.f.e.d.c.example.org." and "example.org.", case in-sensitive
+ result = lsc.compare(ls1);
+ EXPECT_EQ(isc::dns::NameComparisonResult::SUBDOMAIN,
+ result.getRelation());
+ EXPECT_LT(0, result.getOrder());
+ EXPECT_EQ(3, result.getCommonLabels());
+
+ // "e.d.c.example.org." and "example.org.", case in-sensitive
+ lsc.stripLeft(2);
+ result = lsc.compare(ls1);
+ EXPECT_EQ(isc::dns::NameComparisonResult::SUBDOMAIN,
+ result.getRelation());
+ EXPECT_LT(0, result.getOrder());
+ EXPECT_EQ(3, result.getCommonLabels());
+
+ // "example.org." and "example.org.", case in-sensitive
+ lsc.stripLeft(3);
+ result = lsc.compare(ls1);
+ EXPECT_EQ(isc::dns::NameComparisonResult::EQUAL,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(3, result.getCommonLabels());
+
+ // "." and "example.org.", case in-sensitive
+ lsc.stripLeft(2);
+ result = lsc.compare(ls1);
+ EXPECT_EQ(isc::dns::NameComparisonResult::SUPERDOMAIN,
+ result.getRelation());
+ EXPECT_GT(0, result.getOrder());
+ EXPECT_EQ(1, result.getCommonLabels());
+
+ Name nd("a.b.c.isc.example.org");
+ LabelSequence lsd(nd);
+ Name ne("w.x.y.isc.EXAMPLE.org");
+ LabelSequence lse(ne);
+
+ // "a.b.c.isc.example.org." and "w.x.y.isc.EXAMPLE.org.",
+ // case sensitive
+ result = lsd.compare(lse, true);
+ EXPECT_EQ(isc::dns::NameComparisonResult::COMMONANCESTOR,
+ result.getRelation());
+ EXPECT_LT(0, result.getOrder());
+ EXPECT_EQ(2, result.getCommonLabels());
+
+ // "a.b.c.isc.example.org." and "w.x.y.isc.EXAMPLE.org.",
+ // case in-sensitive
+ result = lsd.compare(lse);
+ EXPECT_EQ(isc::dns::NameComparisonResult::COMMONANCESTOR,
+ result.getRelation());
+ EXPECT_GT(0, result.getOrder());
+ EXPECT_EQ(4, result.getCommonLabels());
+
+ // "isc.example.org." and "isc.EXAMPLE.org.", case sensitive
+ lsd.stripLeft(3);
+ lse.stripLeft(3);
+ result = lsd.compare(lse, true);
+ EXPECT_EQ(isc::dns::NameComparisonResult::COMMONANCESTOR,
+ result.getRelation());
+ EXPECT_LT(0, result.getOrder());
+ EXPECT_EQ(2, result.getCommonLabels());
+
+ // "isc.example.org." and "isc.EXAMPLE.org.", case in-sensitive
+ result = lsd.compare(lse);
+ EXPECT_EQ(isc::dns::NameComparisonResult::EQUAL,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(4, result.getCommonLabels());
+
+ Name nf("a.b.c.isc.example.org");
+ LabelSequence lsf(nf);
+ Name ng("w.x.y.isc.EXAMPLE.org");
+ LabelSequence lsg(ng);
+
+ // "a.b.c.isc.example.org." and "w.x.y.isc.EXAMPLE.org" (not
+ // absolute), case in-sensitive
+ lsg.stripRight(1);
+ result = lsg.compare(lsf);
+ EXPECT_EQ(isc::dns::NameComparisonResult::NONE,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(0, result.getCommonLabels());
+
+ // "a.b.c.isc.example.org" (not absolute) and
+ // "w.x.y.isc.EXAMPLE.org" (not absolute), case in-sensitive
+ lsf.stripRight(1);
+ result = lsg.compare(lsf);
+ EXPECT_EQ(isc::dns::NameComparisonResult::COMMONANCESTOR,
+ result.getRelation());
+ EXPECT_LT(0, result.getOrder());
+ EXPECT_EQ(3, result.getCommonLabels());
+
+ // "a.b.c.isc.example" (not absolute) and
+ // "w.x.y.isc.EXAMPLE" (not absolute), case in-sensitive
+ lsf.stripRight(1);
+ lsg.stripRight(1);
+ result = lsg.compare(lsf);
+ EXPECT_EQ(isc::dns::NameComparisonResult::COMMONANCESTOR,
+ result.getRelation());
+ EXPECT_LT(0, result.getOrder());
+ EXPECT_EQ(2, result.getCommonLabels());
+
+ // "a.b.c" (not absolute) and
+ // "w.x.y" (not absolute), case in-sensitive
+ lsf.stripRight(2);
+ lsg.stripRight(2);
+ result = lsg.compare(lsf);
+ EXPECT_EQ(isc::dns::NameComparisonResult::NONE,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(0, result.getCommonLabels());
+
+ Name nh("aexample.org");
+ LabelSequence lsh(nh);
+ Name ni("bexample.org");
+ LabelSequence lsi(ni);
+
+ // "aexample.org" (not absolute) and
+ // "bexample.org" (not absolute), case in-sensitive
+ lsh.stripRight(1);
+ lsi.stripRight(1);
+ result = lsh.compare(lsi);
+ EXPECT_EQ(isc::dns::NameComparisonResult::COMMONANCESTOR,
+ result.getRelation());
+ EXPECT_GT(0, result.getOrder());
+ EXPECT_EQ(1, result.getCommonLabels());
+
+ // "aexample" (not absolute) and
+ // "bexample" (not absolute), case in-sensitive
+ lsh.stripRight(1);
+ lsi.stripRight(1);
+ result = lsh.compare(lsi);
+ EXPECT_EQ(isc::dns::NameComparisonResult::NONE,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(0, result.getCommonLabels());
+
+ Name nj("example.org");
+ LabelSequence lsj(nj);
+ Name nk("example.org");
+ LabelSequence lsk(nk);
+
+ // "example.org" (not absolute) and
+ // "example.org" (not absolute), case in-sensitive
+ lsj.stripRight(1);
+ lsk.stripRight(1);
+ result = lsj.compare(lsk);
+ EXPECT_EQ(isc::dns::NameComparisonResult::EQUAL,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(2, result.getCommonLabels());
+
+ // "example" (not absolute) and
+ // "example" (not absolute), case in-sensitive
+ lsj.stripRight(1);
+ lsk.stripRight(1);
+ result = lsj.compare(lsk);
+ EXPECT_EQ(isc::dns::NameComparisonResult::EQUAL,
+ result.getRelation());
+ EXPECT_EQ(0, result.getOrder());
+ EXPECT_EQ(1, result.getCommonLabels());
+}
+
void
getDataCheck(const uint8_t* expected_data, size_t expected_len,
const LabelSequence& ls)
More information about the bind10-changes
mailing list