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

diff --cc pdns/syncres.cc
index 1d8ac40eb087db36d81c28948ece4fb46a68f038,7f1c4a88dd676237c74ef09993a9fcf66c4284d6..ad0d15215602d86e6ee53561e357ca77ac8157c9
--- 1/pdns/syncres.cc
--- 2/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();
    }

diff --cc pdns/syncres.hh
Simple merge