Use stubDoResolve for ALIAS

PowerDNS · Aug 27, 2024 · 69fde7f · 69fde7f
1 parent 95e7177
commit 69fde7f
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 481 deletions.
diff --git a/meson.build b/meson.build
@@ -533,8 +533,6 @@ common_sources += files(
   src_dir / 'dnspacket.hh',
   src_dir / 'dnsparser.cc',
   src_dir / 'dnsparser.hh',
-  src_dir / 'dnsproxy.cc',
-  src_dir / 'dnsproxy.hh',
   src_dir / 'dnsrecords.cc',
   src_dir / 'dnsrecords.hh',
   src_dir / 'dnssecinfra.cc',

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
@@ -225,7 +225,6 @@ pdns_server_SOURCES = \
 	dnsname.cc dnsname.hh \
 	dnspacket.cc dnspacket.hh \
 	dnsparser.cc \
-	dnsproxy.cc dnsproxy.hh \
 	dnsrecords.cc dnsrecords.hh \
 	dnssecinfra.cc dnssecinfra.hh \
 	dnsseckeeper.hh \

diff --git a/pdns/auth-main.cc b/pdns/auth-main.cc
@@ -79,7 +79,6 @@
 #include "dynlistener.hh"
 #include "dynhandler.hh"
 #include "communicator.hh"
-#include "dnsproxy.hh"
 #include "utility.hh"
 #include "dnsrecords.hh"
 #include "version.hh"
@@ -123,7 +122,6 @@ StatBag S; //!< Statistics are gathered across PDNS via the StatBag class S
 AuthPacketCache PC; //!< This is the main PacketCache, shared across all threads
 AuthQueryCache QC;
 AuthZoneCache g_zoneCache;
-std::unique_ptr<DNSProxy> DP{nullptr};
 static std::unique_ptr<DynListener> s_dynListener{nullptr};
 CommunicatorClass Communicator;
 static double avg_latency{0.0}, receive_latency{0.0}, cache_latency{0.0}, backend_latency{0.0}, send_latency{0.0};
@@ -786,11 +784,6 @@ static void mainthread()
   AuthWebServer webserver;
   Utility::dropUserPrivs(newuid);
 
-  if (::arg().mustDo("resolver")) {
-    DP = std::make_unique<DNSProxy>(::arg()["resolver"], ::arg()["dnsproxy-udp-port-range"]);
-    DP->go();
-  }
-
   try {
     doSecPoll(true);
   }

diff --git a/pdns/auth-main.hh b/pdns/auth-main.hh
@@ -28,7 +28,6 @@
 #include "communicator.hh"
 #include "distributor.hh"
 #include "dnspacket.hh"
-#include "dnsproxy.hh"
 #include "dynlistener.hh"
 #include "nameserver.hh"
 #include "statbag.hh"
@@ -40,7 +39,6 @@ extern ArgvMap theArg;
 extern StatBag S; //!< Statistics are gathered across PDNS via the StatBag class S
 extern AuthPacketCache PC; //!< This is the main PacketCache, shared across all threads
 extern AuthQueryCache QC;
-extern std::unique_ptr<DNSProxy> DP;
 extern CommunicatorClass Communicator;
 void carbonDumpThread(); // Implemented in auth-carbon.cc. Avoids having an auth-carbon.hh declaring exactly one function.
 extern bool g_anyToTcp;