From: bert hubert <bert.hubert@powerdns.com>
Date: Fri, 25 Sep 2015 13:04:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'main/master' into ednssurg
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~28^2~27^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb518d5f60be45ee09d633bdb89f55f6d1aaeb6;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'main/master' into ednssurg
---

1cb518d5f60be45ee09d633bdb89f55f6d1aaeb6
diff --cc pdns/syncres.cc
index 1d8ac40eb0,7f1c4a88dd..ad0d152156
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@@ -75,13 -74,28 +75,27 @@@ SyncRes::LogMode SyncRes::s_lm
  
  #define LOG(x) if(d_lm == Log) { L <<Logger::Warning << x; } else if(d_lm == Store) { d_trace << x; }
  
 -bool SyncRes::s_noEDNSPing;
  bool SyncRes::s_noEDNS;
  
+ void accountAuthLatency(int usec)
+ {
+   if(usec < 1000)
+     g_stats.authAnswers0_1++;
+   else if(usec < 10000)
+     g_stats.authAnswers1_10++;
+   else if(usec < 100000)
+     g_stats.authAnswers10_100++;
+   else if(usec < 1000000)
+     g_stats.authAnswers100_1000++;
+   else
+     g_stats.authAnswersSlow++;
+ }
+ 
  SyncRes::SyncRes(const struct timeval& now) :  d_outqueries(0), d_tcpoutqueries(0), d_throttledqueries(0), d_timeouts(0), d_unreachables(0),
 -					       d_totUsec(0), d_now(now),
 -					       d_cacheonly(false), d_nocache(false),   d_doEDNS0(false), d_lm(s_lm)
 -
 -{
 +					       d_totUsec(0), d_doDNSSEC(false), d_now(now),
 +					       d_cacheonly(false), d_nocache(false), d_doEDNS0(false), d_lm(s_lm)
 +                                                 
 +{ 
    if(!t_sstorage) {
      t_sstorage = new StaticStorage();
    }