Changeset 1438

Timestamp:

10/15/09 22:56:09 (11 months ago)

Author:

ahu

Message:

implement max-cache-ttl, patch by Winfried Angele, for BIND compatability. Thanks!

Location:

trunk/pdns/pdns

Files:

• pdns_recursor.cc (modified) (2 diffs)
• syncres.cc (modified) (3 diffs)
• syncres.hh (modified) (1 diff)

trunk/pdns/pdns/pdns_recursor.cc

@@ -1810 +1810 @@
 
   SyncRes::s_maxnegttl=::arg().asNum("max-negative-ttl");
+  SyncRes::s_maxcachettl=::arg().asNum("max-cache-ttl");
   SyncRes::s_serverID=::arg()["server-id"];
   if(SyncRes::s_serverID.empty()) {
@@ -2083 +2084 @@
     ::arg().set("max-cache-entries", "If set, maximum number of entries in the main cache")="1000000";
     ::arg().set("max-negative-ttl", "maximum number of seconds to keep a negative cached entry in memory")="3600";
+    ::arg().set("max-cache-ttl", "maximum number of seconds to keep a cached entry in memory")="86400";
     ::arg().set("server-id", "Returned when queried for 'server.id' TXT or NSID, defaults to hostname")="";
     ::arg().set("remotes-ringbuffer-entries", "maximum number of packets to store statistics for")="0";

trunk/pdns/pdns/syncres.cc

@@ -51 +51 @@
 
 unsigned int SyncRes::s_maxnegttl;
+unsigned int SyncRes::s_maxcachettl;
 unsigned int SyncRes::s_queries;
 unsigned int SyncRes::s_outgoingtimeouts;
@@ -946 +947 @@
 
       // reap all answers from this packet that are acceptable
-      for(LWResult::res_t::const_iterator i=lwr.d_result.begin();i != lwr.d_result.end();++i) {
+      for(LWResult::res_t::iterator i=lwr.d_result.begin();i != lwr.d_result.end();++i) {
         if(i->qtype.getCode() == QType::OPT) {
           LOG<<prefix<<qname<<": skipping OPT answer '"<<i->qname<<"' from '"<<auth<<"' nameservers" <<endl;
@@ -965 +966 @@
           else {
             LOG<<"YES!"<<endl;
+
+            i->ttl=min(s_maxcachettl, i->ttl);
             
             DNSResourceRecord rr=*i;
             rr.d_place=DNSResourceRecord::ANSWER;
 
-            rr.ttl=min(86400*14U, rr.ttl); // limit TTL to two weeks
             rr.ttl += d_now.tv_sec;
 

trunk/pdns/pdns/syncres.hh

@@ -386 +386 @@
   struct timeval d_now;
   static unsigned int s_maxnegttl;
+  static unsigned int s_maxcachettl;
   static string s_serverID;