Browse Source

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

zhanglikun 14 years ago
parent
commit
a01b61f991

+ 2 - 0
src/lib/cache/TODO

@@ -9,4 +9,6 @@
   can removed first.
   can removed first.
 * Make resolver cache be smart to refetch the messages that are about
 * Make resolver cache be smart to refetch the messages that are about
   to expire.
   to expire.
+* When the rrset beging updated is an NS rrset, NSAS should be updated
+  together.
 
 

+ 1 - 1
src/lib/cache/message_entry.cc

@@ -129,7 +129,7 @@ MessageEntry::getRRsetTrustLevel(const Message& message,
                     ++rrset_iter;
                     ++rrset_iter;
                 }
                 }
                 assert(rrset_iter != message.endSection(section));
                 assert(rrset_iter != message.endSection(section));
-                
+
                 // According RFC2181 section 5.4.1, only the record
                 // According RFC2181 section 5.4.1, only the record
                 // describing that ailas is necessarily authoritative.
                 // describing that ailas is necessarily authoritative.
                 // If there is one or more CNAME records in answer section.
                 // If there is one or more CNAME records in answer section.

+ 4 - 7
src/lib/cache/message_entry.h

@@ -89,16 +89,14 @@ public:
         return (*hash_key_ptr_);
         return (*hash_key_ptr_);
     }
     }
 
 
+    /// \short Protected memebers, so they can be accessed by tests.
+    //@{
 protected:
 protected:
     /// \brief Initialize the message entry with dns message.
     /// \brief Initialize the message entry with dns message.
     ///
     ///
     /// \param message The Message to initialize the entry with
     /// \param message The Message to initialize the entry with
     void initMessageEntry(const isc::dns::Message& message);
     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.
     /// \brief Parse the rrsets in specified section.
     ///
     ///
     /// \param msg The message to parse the RRsets from
     /// \param msg The message to parse the RRsets from
@@ -148,10 +146,9 @@ protected:
     ///         otherwise.
     ///         otherwise.
     bool getRRsetEntries(std::vector<RRsetEntryPtr>& rrset_entry_vec,
     bool getRRsetEntries(std::vector<RRsetEntryPtr>& rrset_entry_vec,
                          const time_t time_now);
                          const time_t time_now);
-    //@}
-protected:
-    /// \note Make the variable be protected for easy test.
+
     time_t expire_time_;  // Expiration time of the message.
     time_t expire_time_;  // Expiration time of the message.
+    //@}
 
 
 private:
 private:
     std::string entry_name_; // The name for this entry(name + type)
     std::string entry_name_; // The name for this entry(name + type)

+ 0 - 3
src/lib/cache/resolver_cache.cc

@@ -239,9 +239,6 @@ ResolverCache::getClassCache(const isc::dns::RRClass& cache_class) const {
     return NULL;
     return NULL;
 }
 }
 
 
-
-
-
 } // namespace cache
 } // namespace cache
 } // namespace isc
 } // namespace isc
 
 

+ 1 - 1
src/lib/cache/tests/cache_test_util.h

@@ -46,7 +46,7 @@ int
 sectionRRsetCount(Message& msg, Message::Section section) {
 sectionRRsetCount(Message& msg, Message::Section section) {
     int count = 0;
     int count = 0;
     for (RRsetIterator rrset_iter = msg.beginSection(section);
     for (RRsetIterator rrset_iter = msg.beginSection(section);
-         rrset_iter != msg.endSection(section); 
+         rrset_iter != msg.endSection(section);
          ++rrset_iter) {
          ++rrset_iter) {
         ++count;
         ++count;
     }
     }

+ 1 - 1
src/lib/cache/tests/rrset_entry_unittest.cc

@@ -51,7 +51,7 @@ class DerivedRRsetEntry: public RRsetEntry {
 public:
 public:
 
 
     void updateTTLForTest() {
     void updateTTLForTest() {
-        
+
     }
     }
 };
 };