From: bert hubert <bert.hubert@powerdns.com>
Date: Wed, 18 Jan 2017 15:18:23 +0000 (+0100)
Subject: make EDNS client subnet do some better logging on --trace
X-Git-Tag: rec-4.0.5-rc2^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=154203176c5cebfd5df199626cce1a5d31bddab9;p=pdns

make EDNS client subnet do some better logging on --trace

(cherry picked from commit 43f759413685af3cc06587c3631009eea3434396)
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 8156f508c..7ec195aef 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -1132,8 +1132,16 @@ int SyncRes::doResolveAt(NsSet &nameservers, DNSName auth, bool flawedNSSet, con
 	    }
 	    else {
 	      ednsmask=getEDNSSubnetMask(d_requestor, qname, *remoteIP);
+              if(ednsmask) {
+                LOG(prefix<<qname<<": Adding EDNS Client Subnet Mask "<<ednsmask->toString()<<" to query"<<endl);
+              }
 	      resolveret=asyncresolveWrapper(*remoteIP, d_doDNSSEC, qname,  qtype.getCode(),
 					     doTCP, sendRDQuery, &d_now, ednsmask, &lwr);    // <- we go out on the wire!
+              if(ednsmask) {
+                LOG(prefix<<qname<<": Received EDNS Client Subnet Mask "<<ednsmask->toString()<<" on response"<<endl);
+              }
+
+
 	    }
             if(resolveret==-3)
 	      throw ImmediateServFailException("Query killed by policy");