Changeset 2117

Timestamp:

04/02/11 11:57:55 (2 years ago)

Author:

ahu

Message:

silence a lot of debugging

Files:

• trunk/pdns/pdns/packethandler.cc (modified) (20 diffs)

trunk/pdns/pdns/packethandler.cc

@@ -454 +454 @@
 void PacketHandler::emitNSEC(const std::string& begin, const std::string& end, const std::string& toNSEC, const SOAData& sd, DNSPacket *r, int mode)
 {
-  cerr<<"We should emit '"<<begin<<"' - ('"<<toNSEC<<"') - '"<<end<<"'"<<endl;
+  // <<"We should emit '"<<begin<<"' - ('"<<toNSEC<<"') - '"<<end<<"'"<<endl;
   NSECRecordContent nrc;
   nrc.d_set.insert(QType::RRSIG);
@@ -482 +482 @@
 void emitNSEC3(DNSBackend& B, const NSEC3PARAMRecordContent& ns3prc, const SOAData& sd, const std::string& unhashed, const std::string& begin, const std::string& end, const std::string& toNSEC3, DNSPacket *r, int mode)
 {
-  cerr<<"We should emit NSEC3 '"<<toLower(toBase32Hex(begin))<<"' - ('"<<toNSEC3<<"') - '"<<toLower(toBase32Hex(end))<<"' (unhashed: '"<<unhashed<<"')"<<endl;
+//  cerr<<"We should emit NSEC3 '"<<toLower(toBase32Hex(begin))<<"' - ('"<<toNSEC3<<"') - '"<<toLower(toBase32Hex(end))<<"' (unhashed: '"<<unhashed<<"')"<<endl;
   NSEC3RecordContent n3rc;
   n3rc.d_set.insert(QType::RRSIG);
@@ -528 +528 @@
 {
   NSEC3PARAMRecordContent ns3rc;
-  cerr<<"Doing NSEC3PARAM lookup for '"<<auth<<"', "<<p->qdomain<<"|"<<p->qtype.getName()<<": ";
+  // cerr<<"Doing NSEC3PARAM lookup for '"<<auth<<"', "<<p->qdomain<<"|"<<p->qtype.getName()<<": ";
   bool narrow;
   if(d_dk.getNSEC3PARAM(auth, &ns3rc, &narrow))  {
-    cerr<<"Present, narrow="<<narrow<<endl;
+    // cerr<<"Present, narrow="<<narrow<<endl;
     addNSEC3(p, r, target, auth, ns3rc, narrow, mode);
   }
   else {
-    cerr<<"Not present"<<endl;
+    // cerr<<"Not present"<<endl;
     addNSEC(p, r, target, auth, mode);
   }
@@ -598 +598 @@
   sd.db = (DNSBackend*)-1;
   if(!B.getSOA(auth, sd)) {
-    cerr<<"Could not get SOA for domain in NSEC3\n";
+    // cerr<<"Could not get SOA for domain in NSEC3\n";
     return;
   }
@@ -609 +609 @@
   
   getNSEC3Hashes(narrow, sd.db, sd.domain_id,  hashed, false, unhashed, before, after); 
-  cerr<<"Done calling for closest encloser, before='"<<toBase32Hex(before)<<"', after='"<<toBase32Hex(after)<<"', unhashed: '"<<unhashed<<"'"<<endl;
+  DLOG(L<<"Done calling for closest encloser, before='"<<toBase32Hex(before)<<"', after='"<<toBase32Hex(after)<<"', unhashed: '"<<unhashed<<"'"<<endl);
   emitNSEC3(ns3rc, sd, unhashed, before, after, target, r, mode);
 
@@ -616 +616 @@
   hashed=hashQNameWithSalt(ns3rc.d_iterations, ns3rc.d_salt, unhashed);
   getNSEC3Hashes(narrow, sd.db,sd.domain_id,  hashed, true, unhashed, before, after); 
-  cerr<<"Done calling for main, before='"<<toBase32Hex(before)<<"', after='"<<toBase32Hex(after)<<"', unhashed: '"<<unhashed<<"'"<<endl;
+  DLOG(L<<"Done calling for main, before='"<<toBase32Hex(before)<<"', after='"<<toBase32Hex(after)<<"', unhashed: '"<<unhashed<<"'"<<endl);
   emitNSEC3( ns3rc, sd, unhashed, before, after, target, r, mode);
   
@@ -624 +624 @@
   
   getNSEC3Hashes(narrow, sd.db, sd.domain_id,  hashed, true, unhashed, before, after); 
-  cerr<<"Done calling for '*', before='"<<toBase32Hex(before)<<"', after='"<<toBase32Hex(after)<<"', unhashed: '"<<unhashed<<"'"<<endl;
+  DLOG(L<<"Done calling for '*', before='"<<toBase32Hex(before)<<"', after='"<<toBase32Hex(after)<<"', unhashed: '"<<unhashed<<"'"<<endl);
   emitNSEC3( ns3rc, sd, unhashed, before, after, target, r, mode);
 }
@@ -633 +633 @@
     return;
   
-  cerr<<"Should add NSEC covering '"<<target<<"' from zone '"<<auth<<"', mode = "<<mode<<endl;
+  DLOG(L<<"Should add NSEC covering '"<<target<<"' from zone '"<<auth<<"', mode = "<<mode<<endl);
   SOAData sd;
   sd.db=(DNSBackend *)-1; // force uncached answer
@@ -641 +641 @@
   }
   else if(!B.getSOA(auth, sd)) {
-    cerr<<"Could not get SOA for domain\n";
+    DLOG(L<<"Could not get SOA for domain"<<endl);
     return;
   }
 
   string before,after;
-  cerr<<"Calling getBeforeandAfter!"<<endl;
+  //cerr<<"Calling getBeforeandAfter!"<<endl;
   sd.db->getBeforeAndAfterNames(sd.domain_id, auth, target, before, after); 
-  cerr<<"Done calling, before='"<<before<<"', after='"<<after<<"'"<<endl;
+  // cerr<<"Done calling, before='"<<before<<"', after='"<<after<<"'"<<endl;
 
   // this stuff is wrong (but it appears to work)
@@ -677 +677 @@
     return false;
   
-  cerr<<"Have arrs "<<arrs.size()<<" records to sign\n";
+  DLOG(L<<"Have arrs "<<arrs.size()<<" records to sign"<<endl);
   vector<DNSResourceRecord> crrs;
   
@@ -757 +757 @@
 
     if(crossedZoneCut) {
-      cerr<<"Should return NS records, and this A/AAAA record in the additional section.."<<endl;
+      DLOG(L<<"Should return NS records, and this A/AAAA record in the additional section.."<<endl);
     }
 
@@ -903 +903 @@
 void PacketHandler::synthesiseRRSIGs(DNSPacket* p, DNSPacket* r)
 {
-  cerr<<"Need to fake up the RRSIGs if someone asked for them explicitly"<<endl;
+  DLOG(L<<"Need to fake up the RRSIGs if someone asked for them explicitly"<<endl);
   typedef map<uint16_t, vector<shared_ptr<DNSRecordContent> > > records_t;
   records_t records;
@@ -943 +943 @@
   bool doNSEC3= d_dk.getNSEC3PARAM(sd.qname, &ns3pr, &narrow);
   if(doNSEC3) {
-    cerr<<"We don't yet add NSEC3 to explicit RRSIG queries correctly yet! (narrow="<<narrow<<")\n";
+    DLOG(L<<"We don't yet add NSEC3 to explicit RRSIG queries correctly yet! (narrow="<<narrow<<")"<<endl);
   }
   else {
@@ -960 +960 @@
     // ok, the NSEC is in..
   }
-  cerr<<"Have "<<records.size()<<" rrsets to sign"<<endl;
+  DLOG(L<<"Have "<<records.size()<<" rrsets to sign"<<endl);
 
   rr.qname = p->qdomain;
@@ -1038 +1038 @@
     return false;
   
-  cerr<<"The best NS is: "<<rrset.begin()->qname<<endl;
+  DLOG(L<<"The best NS is: "<<rrset.begin()->qname<<endl);
   BOOST_FOREACH(DNSResourceRecord rr, rrset) {
-    cerr<<"\tadding '"<<rr.content<<"'\n";
+    DLOG(L<<"\tadding '"<<rr.content<<"'"<<endl);
     rr.d_place=DNSResourceRecord::AUTHORITY;
     r->addRecord(rr);
@@ -1055 +1055 @@
 {
   if(!p->d_dnssecOk)
-    cerr<<"Need to add all the RRSIGs too for '"<<target<<"', should do this manually since DNSSEC was not requested"<<endl;
+    ; // cerr<<"Need to add all the RRSIGs too for '"<<target<<"', should do this manually since DNSSEC was not requested"<<endl;
   //  cerr<<"Need to add all the NSEC too.."<<endl; /// XXX FIXME THE ABOVE IF IS WEIRD
   
@@ -1085 +1085 @@
 
   if(rrset.empty()) {
-    cerr<<"Wildcard matched something, but not of the correct type"<<endl;
+    DLOG(L<<"Wildcard matched something, but not of the correct type"<<endl);
     nodata=true;
   }
   else {
-    cerr<<"The best wildcard match: "<<rrset.begin()->qname<<endl;
+    DLOG(L<<"The best wildcard match: "<<rrset.begin()->qname<<endl);
     BOOST_FOREACH(DNSResourceRecord rr, rrset) {
       if(rr.qtype.getCode() == QType::CNAME)  {
@@ -1098 +1098 @@
       rr.wildcardname = rr.qname;
       rr.qname=p->qdomain;
-      cerr<<"\tadding '"<<rr.content<<"'\n";
+      DLOG(L<<"\tadding '"<<rr.content<<"'"<<endl);
       rr.d_place=DNSResourceRecord::ANSWER;
       r->addRecord(rr);
@@ -1298 +1298 @@
         goto sendit;
       }
-      cerr<<"Found nothing in the ANY and wildcards, let's try NS referral"<<endl;
+      DLOG(L<<"Found nothing in the ANY and wildcards, let's try NS referral"<<endl);
       if(!tryReferral(p, r, sd, target))
         makeNXDomain(p, r, target, sd);
@@ -1329 +1329 @@
     }
     else if(weHaveUnauth) {
-      cerr<<"Have unauth data, so need to hunt for best NS records"<<endl;
+      
+      DLOG(L<<"Have unauth data, so need to hunt for best NS records"<<endl);
       if(tryReferral(p, r, sd, target))
         goto sendit;
-      cerr<<"Should not get here: please run pdnssec rectify-zone "<<sd.qname<<endl;
+      L<<Logger::Error<<"Should not get here: please run pdnssec rectify-zone "<<sd.qname<<endl;
     }
     else {
-      cerr<<"Have some data, but not the right data"<<endl;
+      DLOG(L<<"Have some data, but not the right data"<<endl);
       makeNOError(p, r, target, sd);
     }