Changeset 129

Timestamp:

01/13/03 23:36:34 (10 years ago)

Author:

ahu

Message:

more work

Location:

trunk/pdns/pdns

Files:

• pdns_recursor.cc (modified) (5 diffs)
• syncres.cc (modified) (4 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -18 +18 @@
 */
  
-
 #include <iostream>
 #include <errno.h>
@@ -101 +100 @@
 typedef map<string,set<DNSResourceRecord> > cache_t;
 cache_t cache;
+int cacheHits, cacheMisses;
 int getCache(const string &qname, const QType& qt, set<DNSResourceRecord>* res)
 {
@@ -107 +107 @@
     if(res)
       *res=j->second;
+    cacheHits++;
     return (unsigned int)j->second.begin()->ttl-time(0);
   }
+  cacheMisses++;
   return -1;
 }
@@ -296 +298 @@
     PacketID pident;
     init();    
+    int counter=0;
     for(;;) {
       while(MT.schedule()); // housekeeping, let threads do their thing
@@ -361 +364 @@
             cout<<"new question arrived for '"<<P.qdomain<<"|"<<P.qtype.getName()<<"' from "<<P.getRemote()<<endl;
             MT.makeThread(startDoResolve,(void*)new DNSPacket(P));
+            if(!((counter++)%100)) {
+              cout<<"stats: "<<counter<<" questions, "<<cache.size()<<" cache entries, "<<(cacheHits*100.0)/(cacheHits+cacheMisses)<<"% cache hits"<<endl;
+            }
           }
         }

trunk/pdns/pdns/syncres.cc

@@ -142 +142 @@
 template<class MultiPlexor>bool SyncRes<MultiPlexor>::doCNAMECacheCheck(const string &qname, const QType &qtype, vector<DNSResourceRecord>&ret, int depth, int &res)
 {
+  if(depth>10) {
+    cout<<prefix<<qname<<": CNAME loop too deep, depth="<<depth<<endl;
+    res=RCode::ServFail;
+    return true;
+  }
+    
   string prefix, tuple=toLower(qname)+"|CNAME";
   prefix.assign(3*depth, ' ');
@@ -323 +329 @@
 
       bool done=false, realreferral=false, negindic=false;
-      string newauth, soaname;
+      string newauth, soaname, newtarget;
 
       for(LWRes::res_t::const_iterator i=result.begin();i!=result.end();++i) {
@@ -333 +339 @@
         }
         else if(i->d_place==DNSResourceRecord::ANSWER && i->qname==qname && i->qtype.getCode()==QType::CNAME && (!(qtype==QType(QType::CNAME)))) {
-          cout<<prefix<<qname<<": got a CNAME referral, starting over with "<<i->content<<endl<<endl;
           ret.push_back(*i);
-          set<GetBestNSAnswer>beenthere2;
-          return doResolve(i->content, qtype, ret,0,beenthere2);
+          newtarget=i->content;
         }
         // for ANY answers we *must* have an authoritive answer
@@ -368 +372 @@
         return 0;
       }
+      if(!newtarget.empty()) {
+        cout<<prefix<<qname<<": status=got a CNAME referral, starting over with "<<newtarget<<endl<<endl;
+        set<GetBestNSAnswer>beenthere2;
+        return doResolve(newtarget, qtype, ret,0,beenthere2);
+      }
       else if(realreferral) {
         cout<<prefix<<qname<<": status=did not resolve, got "<<nsset.size()<<" NS, looping to them"<<endl;