BIND 10 master, updated. 98908690535371b9128a1263c7a4b59150609526 Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  98908690535371b9128a1263c7a4b59150609526 (commit)
       via  a01b61f9915856af9c915beca5061867804e5a86 (commit)
      from  5ba0bcb7d12da8e28ca791fef5bdb82ee2619fa8 (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 98908690535371b9128a1263c7a4b59150609526
Merge: a01b61f9915856af9c915beca5061867804e5a86 5ba0bcb7d12da8e28ca791fef5bdb82ee2619fa8
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Wed Feb 16 19:04:14 2011 +0800

    Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

commit a01b61f9915856af9c915beca5061867804e5a86
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Wed Feb 16 19:03:54 2011 +0800

    [master] minor fix. Remove some space at the end of lines, and fix one doxygen comment. skip review.

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

Summary of changes:
 src/lib/cache/TODO                            |    2 ++
 src/lib/cache/message_entry.cc                |    2 +-
 src/lib/cache/message_entry.h                 |   11 ++++-------
 src/lib/cache/resolver_cache.cc               |    3 ---
 src/lib/cache/tests/cache_test_sectioncount.h |    2 +-
 src/lib/cache/tests/rrset_entry_unittest.cc   |    2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/cache/TODO b/src/lib/cache/TODO
index 0743ee4..a7d2458 100644
--- a/src/lib/cache/TODO
+++ b/src/lib/cache/TODO
@@ -9,4 +9,6 @@
   can removed first.
 * Make resolver cache be smart to refetch the messages that are about
   to expire.
+* When the rrset beging updated is an NS rrset, NSAS should be updated
+  together.
 
diff --git a/src/lib/cache/message_entry.cc b/src/lib/cache/message_entry.cc
index fe21ce9..2fdb07c 100644
--- a/src/lib/cache/message_entry.cc
+++ b/src/lib/cache/message_entry.cc
@@ -131,7 +131,7 @@ MessageEntry::getRRsetTrustLevel(const Message& message,
                     ++rrset_iter;
                 }
                 assert(rrset_iter != message.endSection(section));
-                
+
                 // According RFC2181 section 5.4.1, only the record
                 // describing that ailas is necessarily authoritative.
                 // If there is one or more CNAME records in answer section.
diff --git a/src/lib/cache/message_entry.h b/src/lib/cache/message_entry.h
index 0ed00f0..20b2472 100644
--- a/src/lib/cache/message_entry.h
+++ b/src/lib/cache/message_entry.h
@@ -89,16 +89,14 @@ public:
         return (*hash_key_ptr_);
     }
 
+    /// \short Protected memebers, so they can be accessed by tests.
+    //@{
 protected:
     /// \brief Initialize the message entry with dns message.
     ///
     /// \param message The Message to initialize the entry with
     void initMessageEntry(const isc::dns::Message& message);
 
-    /// \brief These two functions should be static functions
-    ///        placed in cc file. Put them here just for easy unit
-    ///        tests.
-    //@{
     /// \brief Parse the rrsets in specified section.
     ///
     /// \param msg The message to parse the RRsets from
@@ -148,10 +146,9 @@ protected:
     ///         otherwise.
     bool getRRsetEntries(std::vector<RRsetEntryPtr>& rrset_entry_vec,
                          const time_t time_now);
-    //@}
-protected:
-    /// \note Make the variable be protected for easy test.
+
     time_t expire_time_;  // Expiration time of the message.
+    //@}
 
 private:
     std::string entry_name_; // The name for this entry(name + type)
diff --git a/src/lib/cache/resolver_cache.cc b/src/lib/cache/resolver_cache.cc
index aa681cc..7ebdb4f 100644
--- a/src/lib/cache/resolver_cache.cc
+++ b/src/lib/cache/resolver_cache.cc
@@ -241,9 +241,6 @@ ResolverCache::getClassCache(const isc::dns::RRClass& cache_class) const {
     return NULL;
 }
 
-
-
-
 } // namespace cache
 } // namespace isc
 
diff --git a/src/lib/cache/tests/cache_test_sectioncount.h b/src/lib/cache/tests/cache_test_sectioncount.h
index 9583805..a385133 100644
--- a/src/lib/cache/tests/cache_test_sectioncount.h
+++ b/src/lib/cache/tests/cache_test_sectioncount.h
@@ -33,7 +33,7 @@ int
 sectionRRsetCount(Message& msg, Message::Section section) {
     int count = 0;
     for (RRsetIterator rrset_iter = msg.beginSection(section);
-         rrset_iter != msg.endSection(section); 
+         rrset_iter != msg.endSection(section);
          ++rrset_iter) {
         ++count;
     }
diff --git a/src/lib/cache/tests/rrset_entry_unittest.cc b/src/lib/cache/tests/rrset_entry_unittest.cc
index 1973b72..29c05b5 100644
--- a/src/lib/cache/tests/rrset_entry_unittest.cc
+++ b/src/lib/cache/tests/rrset_entry_unittest.cc
@@ -52,7 +52,7 @@ public:
     DerivedRRsetEntry(const isc::dns::RRset& rrset, const RRsetTrustLevel& level) : RRsetEntry(rrset, level) {};
 
     void updateTTLForTest() {
-        
+
     }
 };