Changeset 856

Timestamp:

06/18/06 19:44:02 (7 years ago)

Author:

ahu

Message:

cache now prefers authoritative data, suggested and explained by Darren
Gamble

Location:

trunk/pdns/pdns

Files:

• recursor_cache.cc (modified) (2 diffs)
• recursor_cache.hh (modified) (1 diff)

trunk/pdns/pdns/recursor_cache.cc

@@ -209 +209 @@
   bool isNew=false;
   if(stored == d_cache.end()) {
-    stored=d_cache.insert(CacheEntry(key,vector<StoredRecord>())).first;
+    stored=d_cache.insert(CacheEntry(key,vector<StoredRecord>(), auth)).first;
     isNew=true;
   }
@@ -221 +221 @@
     ce.d_records.clear();
 
-
+  if(auth && !ce.d_auth) {
+    ce.d_records.clear(); // clear non-auth data
+    ce.d_auth = true;
+  }
+  
   for(set<DNSResourceRecord>::const_iterator i=content.begin(); i != content.end(); ++i) {
     dr.d_ttd=i->ttl;

trunk/pdns/pdns/recursor_cache.hh

@@ -78 +78 @@
     string d_qname;
     uint16_t d_qtype;
+    bool d_auth;
 
-    CacheEntry(const tuple<string, uint16_t>& key, const vector<StoredRecord>& records) : 
-      d_qname(key.get<0>()), d_qtype(key.get<1>()), d_records(records)
+    CacheEntry(const tuple<string, uint16_t>& key, const vector<StoredRecord>& records, bool auth) : 
+      d_qname(key.get<0>()), d_qtype(key.get<1>()), d_auth(auth), d_records(records)
     {}