From bf4ab7072a338ee0692f4747c6f0832717cd6a74 Mon Sep 17 00:00:00 2001
From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 11 Nov 2015 20:26:58 +0100
Subject: [PATCH] silence ton of EDNS client subnet debugging

---
 pdns/lwres.cc          |  4 ++--
 pdns/recursor_cache.cc | 12 ++++--------
 pdns/syncres.cc        |  3 ---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pdns/lwres.cc b/pdns/lwres.cc
index 6ca228949..b8f657fde 100644
--- a/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@ -72,7 +72,7 @@ int asyncresolve(const ComboAddress& ip, const DNSName& domain, int type, bool d
     if(srcmask) {
       EDNSSubnetOpts eo;
       eo.source = *srcmask;
-      cout<<"Adding request mask: "<<eo.source.toString()<<endl;
+      //      cout<<"Adding request mask: "<<eo.source.toString()<<endl;
       opts.push_back(make_pair(8, makeEDNSSubnetOptsString(eo)));
       srcmask=boost::optional<Netmask>(); // this is also our return value
     }
@@ -189,7 +189,7 @@ int asyncresolve(const ComboAddress& ip, const DNSName& domain, int type, bool d
 	if(opt.first==8) {
 	  EDNSSubnetOpts reso;
 	  if(getEDNSSubnetOptsFromString(opt.second, &reso)) {
-	    cerr<<"EDNS Subnet response: "<<reso.source.toString()<<", scope: "<<reso.scope.toString()<<", family = "<<reso.scope.getNetwork().sin4.sin_family<<endl;
+	    //	    cerr<<"EDNS Subnet response: "<<reso.source.toString()<<", scope: "<<reso.scope.toString()<<", family = "<<reso.scope.getNetwork().sin4.sin_family<<endl;
 	    if(reso.scope.getBits())
 	      srcmask = reso.scope;
 	  }
diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index af1562b5c..dc23ed300 100644
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -50,7 +50,7 @@ int MemRecursorCache::get(time_t now, const DNSName &qname, const QType& qt, vec
   if(d_cachecache.first!=d_cachecache.second) {
     for(cache_t::const_iterator i=d_cachecache.first; i != d_cachecache.second; ++i) {
       if(!i->d_netmask.empty()) {
-	cout<<"Had a subnet specific hit: "<<i->d_netmask.toString()<<", query was for "<<who.toString()<<": match "<<i->d_netmask.match(who)<<endl;
+	//	cout<<"Had a subnet specific hit: "<<i->d_netmask.toString()<<", query was for "<<who.toString()<<": match "<<i->d_netmask.match(who)<<endl;
 	haveSubnetSpecific=true;
       }
     }
@@ -125,9 +125,6 @@ bool MemRecursorCache::attemptToRefreshNSTTL(const QType& qt, const vector<DNSRe
 
 void MemRecursorCache::replace(time_t now, const DNSName &qname, const QType& qt,  const vector<DNSRecord>& content, const vector<shared_ptr<RRSIGRecordContent>>& signatures, bool auth, boost::optional<Netmask> ednsmask)
 {
-  if(ednsmask) {
-    cerr<<"This data is actually subnet mask specific!!"<<endl;
-  }
   d_cachecachevalid=false;
 
   cache_t::iterator stored;
@@ -152,13 +149,13 @@ void MemRecursorCache::replace(time_t now, const DNSName &qname, const QType& qt
   ce.d_qtype=qt.getCode();
   ce.d_signatures=signatures;
 
-  cerr<<"asked to store "<< (qname.empty() ? "EMPTY" : qname.toString()) <<"|"+qt.getName()<<" -> '"<<content.begin()->d_content->getZoneRepresentation()<<"', auth="<<auth<<", ce.auth="<<ce.d_auth<<", "<< (ednsmask ? ednsmask->toString() : "")<<endl;
+  // cerr<<"asked to store "<< (qname.empty() ? "EMPTY" : qname.toString()) <<"|"+qt.getName()<<" -> '"<<content.begin()->d_content->getZoneRepresentation()<<"', auth="<<auth<<", ce.auth="<<ce.d_auth<<", "<< (ednsmask ? ednsmask->toString() : "")<<endl;
 
   ce.d_records.clear();
 
   if(!auth && ce.d_auth) {  // unauth data came in, we have some auth data, but is it fresh?
     if(ce.d_ttd > now) { // we still have valid data, ignore unauth data
-      cerr<<"\tStill hold valid auth data, and the new data is unauth, return\n";
+      //      cerr<<"\tStill hold valid auth data, and the new data is unauth, return\n";
       return;
     }
     else {
@@ -181,14 +178,13 @@ void MemRecursorCache::replace(time_t now, const DNSName &qname, const QType& qt
 //  else cerr<<"\tNot nuking"<<endl;
 
 
-  cerr<<"\tHave "<<content.size()<<" records to store\n";
   for(auto i=content.cbegin(); i != content.cend(); ++i) {
     // cerr<<"To store: "<<i->content<<" with ttl/ttd "<<i->ttl<<endl;
     ce.d_ttd=min(maxTTD, i->d_ttl);   // XXX this does weird things if TTLs differ in the set
     ce.d_records.push_back(i->d_content);
     // there was code here that did things with TTL and auth. Unsure if it was good. XXX
   }
-  cerr<<"Calling replace"<<endl;
+
   d_cache.replace(stored, ce);
 }
 
diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index afa650072..f274ccdb9 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -993,9 +993,6 @@ int SyncRes::doResolveAt(set<DNSName> nameservers, DNSName auth, bool flawedNSSe
 	      ednsmask=getEDNSSubnetMask(d_requestor, qname, *remoteIP);
 	      resolveret=asyncresolveWrapper(*remoteIP, qname,  qtype.getCode(),
 					     doTCP, sendRDQuery, &d_now, ednsmask, &lwr);    // <- we go out on the wire!
-	      if(ednsmask && ednsmask->getBits()) {
-		cerr<<"Actually got something back.. "<<ednsmask->toString()<<endl;
-	      }
 	    }
             if(resolveret==-3)
 	      throw ImmediateServFailException("Query killed by policy");
-- 
2.40.0