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

Conflicts:
	.travis.yml

diff --cc pdns/dnsdist-lua.cc
Simple merge

diff --cc pdns/rec_channel_rec.cc
Simple merge

diff --cc pdns/syncres.cc
index 02b9df4c047f861133ed177f7e1b1e4122105b44,d5d276295701fcf4dab8ac58f02ac26d796ea5bd..dce3f8186daedc8c9b5e6c1fbac13ef40f8cfb7c
--- 1/pdns/syncres.cc
--- 2/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@@ -75,20 -76,35 +77,34 @@@ 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)
+ void accountAuthLatency(int usec, int family)
  {
-   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++;
+   if(family == AF_INET) {
+     if(usec < 1000)
+       g_stats.auth4Answers0_1++;
+     else if(usec < 10000)
+       g_stats.auth4Answers1_10++;
+     else if(usec < 100000)
+       g_stats.auth4Answers10_100++;
+     else if(usec < 1000000)
+       g_stats.auth4Answers100_1000++;
+     else
+       g_stats.auth4AnswersSlow++;
+   } else  {
+     if(usec < 1000)
+       g_stats.auth6Answers0_1++;
+     else if(usec < 10000)
+       g_stats.auth6Answers1_10++;
+     else if(usec < 100000)
+       g_stats.auth6Answers10_100++;
+     else if(usec < 1000000)
+       g_stats.auth6Answers100_1000++;
+     else
+       g_stats.auth6AnswersSlow++;
+   }
+ 
  }
  
  SyncRes::SyncRes(const struct timeval& now) :  d_outqueries(0), d_tcpoutqueries(0), d_throttledqueries(0), d_timeouts(0), d_unreachables(0),

diff --cc pdns/syncres.hh
Simple merge

diff --cc pdns/ws-auth.cc
Simple merge