Merge pull request #8387 from rgacogne/dnsdist-tls-versions

dnsdist: Add metrics about TLS versions with DNS over TLS

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

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

diff --cc pdns/dnsdistdist/doh.cc
Simple merge

diff --cc pdns/dnsdistdist/tcpiohandler.cc
Simple merge

diff --cc pdns/doh.hh
index eb03f5b7c2fdbd2cfcea95c7b3aa9bbcdec54d2e,5ed812a5d8ba4dfdf14053c59310da14a2008e97..289b883614fc874e9fe0e1cab9eab8a75ef2ea86
--- 1/pdns/doh.hh
--- 2/pdns/doh.hh
+++ b/pdns/doh.hh
@@@ -67,21 -63,15 +67,15 @@@ struct DOHFronten
    size_t d_maxStoredSessions{20480};
    uint8_t d_numberOfTicketsKeys{5};
    bool d_enableTickets{true};
 +  bool d_preferServerCiphers{false};
  
-   std::atomic<uint64_t> d_httpconnects;   // number of TCP/IP connections established
-   std::atomic<uint64_t> d_tls10queries;   // valid DNS queries received via TLSv1.0
-   std::atomic<uint64_t> d_tls11queries;   // valid DNS queries received via TLSv1.1
-   std::atomic<uint64_t> d_tls12queries;   // valid DNS queries received via TLSv1.2
-   std::atomic<uint64_t> d_tls13queries;   // valid DNS queries received via TLSv1.3
-   std::atomic<uint64_t> d_tlsUnknownqueries;   // valid DNS queries received via unknown TLS version
- 
-   std::atomic<uint64_t> d_getqueries;     // valid DNS queries received via GET
-   std::atomic<uint64_t> d_postqueries;    // valid DNS queries received via POST
-   std::atomic<uint64_t> d_badrequests;     // request could not be converted to dns query
-   std::atomic<uint64_t> d_errorresponses; // dnsdist set 'error' on response
-   std::atomic<uint64_t> d_redirectresponses; // dnsdist set 'redirect' on response
-   std::atomic<uint64_t> d_validresponses; // valid responses sent out
+   std::atomic<uint64_t> d_httpconnects{0};   // number of TCP/IP connections established
+   std::atomic<uint64_t> d_getqueries{0};     // valid DNS queries received via GET
+   std::atomic<uint64_t> d_postqueries{0};    // valid DNS queries received via POST
+   std::atomic<uint64_t> d_badrequests{0};     // request could not be converted to dns query
+   std::atomic<uint64_t> d_errorresponses{0}; // dnsdist set 'error' on response
+   std::atomic<uint64_t> d_redirectresponses{0}; // dnsdist set 'redirect' on response
+   std::atomic<uint64_t> d_validresponses{0}; // valid responses sent out
  
    struct HTTPVersionStats
    {

diff --cc pdns/tcpiohandler.hh
Simple merge