BIND 10 trac2165_2, updated. d057be8fd1bb48ad6ccead205fd81056c8289713 [2165] Add the attached RRSIG when dumping RRsets

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Aug 15 19:45:20 UTC 2012


The branch, trac2165_2 has been updated
       via  d057be8fd1bb48ad6ccead205fd81056c8289713 (commit)
       via  525a74df1749fc36b12047d0e8109519e5d0088c (commit)
      from  8cc84c69fa53568b69491d6374eb46abeb76621d (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 d057be8fd1bb48ad6ccead205fd81056c8289713
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Aug 16 01:14:36 2012 +0530

    [2165] Add the attached RRSIG when dumping RRsets
    
    This realistically belongs in RRset::toText(), but I think current
    code expects RRset::toText() to just return text for that RRset and
    not any attached RRSIGs.

commit 525a74df1749fc36b12047d0e8109519e5d0088c
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Aug 16 01:12:37 2012 +0530

    [2165] Disable test code that is no longer correct
    
    This test cannot possibly work anymore due to the description
    in the comment.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/testutils/dnsmessage_test.h |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/lib/testutils/dnsmessage_test.h b/src/lib/testutils/dnsmessage_test.h
index 57cb72c..fbcb185 100644
--- a/src/lib/testutils/dnsmessage_test.h
+++ b/src/lib/testutils/dnsmessage_test.h
@@ -168,6 +168,10 @@ public:
     {}
     void operator()(isc::dns::ConstRRsetPtr rrset) {
         output_ += "  " + rrset->toText();
+
+        if (rrset->getRRsig()) {
+            output_ += "  " + rrset->getRRsig()->toText();
+        }
     }
 private:
     std::string& output_;
@@ -256,6 +260,7 @@ rrsetsCheck(EXPECTED_ITERATOR expected_begin, EXPECTED_ITERATOR expected_end,
         if (found_rrset_it != expected_end) {
             rrsetCheck(*found_rrset_it, *it);
             ++rrset_matched;
+            rrset_matched += (*it)->getRRsigDataCount();
         }
     }
 
@@ -265,9 +270,19 @@ rrsetsCheck(EXPECTED_ITERATOR expected_begin, EXPECTED_ITERATOR expected_end,
                      "Expected:\n" + expected_text);
         // make sure all expected RRsets are in actual sets
         EXPECT_EQ(std::distance(expected_begin, expected_end), rrset_matched);
+
+#if (0)
+        // Disabled by #2165. The RRSIG RRsets are no longer directly
+        // stored in the Message's rrsets, so the iterator will not find
+        // them. The expected text used in many tests are flattened,
+        // where the RRSIGs are inline. In other words, RRSIGs may occur
+        // between (expected_begin, expected_end) but not between
+        // (actual_begin, actual_end).
+
         // make sure rrsets only contains expected RRsets
         EXPECT_EQ(std::distance(expected_begin, expected_end),
                   std::distance(actual_begin, actual_end));
+#endif
     }
 }
 



More information about the bind10-changes mailing list