From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 27 May 2014 08:16:11 +0000 (+0200)
Subject: add comment, plus add dnslabeltext.rl to recursor tarball as requested in #1406.... 
X-Git-Tag: rec-3.6.0-rc1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a6b1027f1a685812eb2cca2c034af0e52033c49;p=thirdparty%2Fpdns.git

add comment, plus add dnslabeltext.rl to recursor tarball as requested in #1406. Closes #1406.
---

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index 6a2e724a04..250b4d1888 100755
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -65,6 +65,7 @@ cp -a ext/polarssl-1.3.2/library/aes.c ext/polarssl-1.3.2/library/padlock.c $DIR
 cp -a ext/yahttp/ $DIRNAME/ext/
 mkdir $DIRNAME/rrd
 cp tools/rrd/{create,update,makegraphs,index.html} $DIRNAME/rrd
+cp dnslabeltext.rl $DIRNAME
 cp pdns-recursor.init.d $DIRNAME
 cp docs/pdns_recursor.1 docs/rec_control.1 $DIRNAME
 cp configure-recursor $DIRNAME/configure
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index e6f958d6bf..4d1fe24874 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -694,7 +694,7 @@ void startDoResolve(void *p)
     uint64_t newLat=(uint64_t)(spent*1000000);
     newLat = min(newLat,(uint64_t)(g_networkTimeoutMsec*1000)); // outliers of several minutes exist..
     g_stats.avgLatencyUsec=(1-1.0/g_latencyStatSize)*g_stats.avgLatencyUsec + (float)newLat/g_latencyStatSize;
-
+    // no worries, we do this for packet cache hits elsewhere
     delete dc;
     dc=0;
   }
@@ -875,7 +875,7 @@ string* doProcessUDPQuestion(const std::string& question, const ComboAddress& fr
     if(!SyncRes::s_nopacketcache && t_packetCache->getResponsePacket(question, g_now.tv_sec, &response, &age)) {
       if(!g_quiet)
         L<<Logger::Error<<t_id<< " question answered from packet cache from "<<fromaddr.toString()<<endl;
-
+      
       g_stats.packetCacheHits++;
       SyncRes::s_queries++;
       ageDNSPacket(response, age);