From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 23 Oct 2025 09:18:56 +0000 (+0200)
Subject: chore(dnsdist): create a dnsdist::dnscrypt namespace
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=300288f06f61ac43cb453b467770682dbce3d04b;p=thirdparty%2Fpdns.git

chore(dnsdist): create a dnsdist::dnscrypt namespace
---

diff --git a/pdns/dnsdistdist/dnsdist-dnscrypt.cc b/pdns/dnsdistdist/dnsdist-dnscrypt.cc
index 7de63bf163..ccccff65ae 100644
--- a/pdns/dnsdistdist/dnsdist-dnscrypt.cc
+++ b/pdns/dnsdistdist/dnsdist-dnscrypt.cc
@@ -27,6 +27,9 @@
 #include "dnsdist-metrics.hh"
 #include "dnscrypt.hh"
 
+namespace dnsdist::dnscrypt
+{
+
 bool handleDNSCryptQuery(PacketBuffer& packet, DNSCryptQuery& query, bool tcp, time_t now, PacketBuffer& response)
 {
   query.parsePacket(packet, tcp, now);
@@ -86,3 +89,4 @@ bool checkDNSCryptQuery([[maybe_unused]] const ClientState& clientState, [[maybe
 #endif /* HAVE_DNSCRYPT */
   return false;
 }
+} // namespace dnsdist::dnscrypt
diff --git a/pdns/dnsdistdist/dnsdist-dnscrypt.hh b/pdns/dnsdistdist/dnsdist-dnscrypt.hh
index 487f30c2d2..f366d69b70 100644
--- a/pdns/dnsdistdist/dnsdist-dnscrypt.hh
+++ b/pdns/dnsdistdist/dnsdist-dnscrypt.hh
@@ -24,8 +24,11 @@
 #include "config.h"
 #include "dnsdist.hh"
 
+namespace dnsdist::dnscrypt
+{
 #ifdef HAVE_DNSCRYPT
 bool handleDNSCryptQuery(PacketBuffer& packet, DNSCryptQuery& query, bool tcp, time_t now, PacketBuffer& response);
 bool encryptResponse(PacketBuffer& response, size_t maximumSize, bool tcp, std::unique_ptr<DNSCryptQuery>& dnsCryptQuery);
 #endif
 bool checkDNSCryptQuery(const ClientState& clientState, PacketBuffer& query, std::unique_ptr<DNSCryptQuery>& dnsCryptQuery, time_t now, bool tcp);
+} // namespace dnsdist::dnscrypt
diff --git a/pdns/dnsdistdist/dnsdist-tcp.cc b/pdns/dnsdistdist/dnsdist-tcp.cc
index b01a15e832..7ddeea5163 100644
--- a/pdns/dnsdistdist/dnsdist-tcp.cc
+++ b/pdns/dnsdistdist/dnsdist-tcp.cc
@@ -817,7 +817,7 @@ IncomingTCPConnectionState::QueryProcessingResult IncomingTCPConnectionState::ha
     ids.d_streamID = *streamID;
   }
 
-  auto dnsCryptResponse = checkDNSCryptQuery(*d_ci.cs, query, ids.dnsCryptQuery, ids.queryRealTime.d_start.tv_sec, true);
+  auto dnsCryptResponse = dnsdist::dnscrypt::checkDNSCryptQuery(*d_ci.cs, query, ids.dnsCryptQuery, ids.queryRealTime.d_start.tv_sec, true);
   if (dnsCryptResponse) {
     TCPResponse response;
     d_state = State::idle;
diff --git a/pdns/dnsdistdist/dnsdist.cc b/pdns/dnsdistdist/dnsdist.cc
index 39524ce9a3..9d66f78570 100644
--- a/pdns/dnsdistdist/dnsdist.cc
+++ b/pdns/dnsdistdist/dnsdist.cc
@@ -437,7 +437,7 @@ bool processResponseAfterRules(PacketBuffer& response, DNSResponse& dnsResponse,
 
 #ifdef HAVE_DNSCRYPT
   if (!muted) {
-    if (!encryptResponse(response, dnsResponse.getMaximumSize(), dnsResponse.overTCP(), dnsResponse.ids.dnsCryptQuery)) {
+    if (!dnsdist::dnscrypt::encryptResponse(response, dnsResponse.getMaximumSize(), dnsResponse.overTCP(), dnsResponse.ids.dnsCryptQuery)) {
       return false;
     }
   }
@@ -1223,7 +1223,7 @@ static bool prepareOutgoingResponse([[maybe_unused]] const ClientState& clientSt
 
 #ifdef HAVE_DNSCRYPT
   if (!clientState.muted) {
-    if (!encryptResponse(dnsQuestion.getMutableData(), dnsQuestion.getMaximumSize(), dnsQuestion.overTCP(), dnsQuestion.ids.dnsCryptQuery)) {
+    if (!dnsdist::dnscrypt::encryptResponse(dnsQuestion.getMutableData(), dnsQuestion.getMaximumSize(), dnsQuestion.overTCP(), dnsQuestion.ids.dnsCryptQuery)) {
       return false;
     }
   }
@@ -1755,7 +1755,7 @@ static void processUDPQuery(ClientState& clientState, const struct msghdr* msgh,
 
     ids.queryRealTime.start();
 
-    auto dnsCryptResponse = checkDNSCryptQuery(clientState, query, ids.dnsCryptQuery, ids.queryRealTime.d_start.tv_sec, false);
+    auto dnsCryptResponse = dnsdist::dnscrypt::checkDNSCryptQuery(clientState, query, ids.dnsCryptQuery, ids.queryRealTime.d_start.tv_sec, false);
     if (dnsCryptResponse) {
       if (!clientState.muted) {
         sendUDPResponse(clientState.udpFD, query, 0, dest, remote);
@@ -1901,7 +1901,7 @@ bool XskProcessQuery(ClientState& clientState, XskPacket& packet)
 
     ids.queryRealTime.start();
 
-    auto dnsCryptResponse = checkDNSCryptQuery(clientState, query, ids.dnsCryptQuery, ids.queryRealTime.d_start.tv_sec, false);
+    auto dnsCryptResponse = dnsdist::dnscrypt::checkDNSCryptQuery(clientState, query, ids.dnsCryptQuery, ids.queryRealTime.d_start.tv_sec, false);
     if (dnsCryptResponse) {
       packet.setPayload(query);
       return true;