Use a name for `const std::shared_ptr<Log::Logger>&`, call it `Logr::log_t`

diff --git a/pdns/arguments.hh b/pdns/arguments.hh
index 1e48ee2b79a5dd3132fe8677aa1021241a7ec002..29081bfb0cfa6d745fb3534054333144beef790f 100644 (file)
--- a/pdns/arguments.hh
+++ b/pdns/arguments.hh
@@ -120,7 +120,7 @@ public:
   const vector<string>&getCommands();
   void gatherIncludes(std::vector<std::string> &extraConfigs);
 #ifdef RECURSOR
-  void setSLog(std::shared_ptr<Logr::Logger>& log)
+  void setSLog(Logr::log_t log)
   {
     d_log = log;
   }

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 8fd633136b947a69aecd36f5bd93ce36acbf50dd..e888a88da9cd5af0f3bb8ed5c96c67829f410cdb 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -552,7 +552,7 @@ static PolicyResult handlePolicyHit(const DNSFilterEngine::Policy& appliedPolicy
 }
 
 #ifdef NOD_ENABLED
-static bool nodCheckNewDomain(const shared_ptr<Logr::Logger>& nodlogger, const DNSName& dname)
+static bool nodCheckNewDomain(Logr::log_t nodlogger, const DNSName& dname)
 {
   bool ret = false;
   // First check the (sub)domain isn't ignored for NOD purposes
@@ -570,7 +570,7 @@ static bool nodCheckNewDomain(const shared_ptr<Logr::Logger>& nodlogger, const D
   return ret;
 }
 
-static void sendNODLookup(const shared_ptr<Logr::Logger>& nodlogger, const DNSName& dname)
+static void sendNODLookup(Logr::log_t nodlogger, const DNSName& dname)
 {
   if (!(g_nodLookupDomain.isRoot())) {
     // Send a DNS A query to <domain>.g_nodLookupDomain
@@ -591,7 +591,7 @@ static void sendNODLookup(const shared_ptr<Logr::Logger>& nodlogger, const DNSNa
   }
 }
 
-static bool udrCheckUniqueDNSRecord(const shared_ptr<Logr::Logger>& nodlogger, const DNSName& dname, uint16_t qtype, const DNSRecord& record)
+static bool udrCheckUniqueDNSRecord(Logr::log_t nodlogger, const DNSName& dname, uint16_t qtype, const DNSRecord& record)
 {
   bool ret = false;
   if (record.d_place == DNSResourceRecord::ANSWER || record.d_place == DNSResourceRecord::ADDITIONAL) {
@@ -2289,7 +2289,7 @@ static void handleNewUDPQuestion(int fd, FDMultiplexer::funcparam_t& var)
   }
 }
 
-void makeUDPServerSockets(deferredAdd_t& deferredAdds, std::shared_ptr<Logr::Logger>& log)
+void makeUDPServerSockets(deferredAdd_t& deferredAdds, Logr::log_t log)
 {
   int one = 1;
   vector<string> locals;

diff --git a/pdns/recursordist/logr.hh b/pdns/recursordist/logr.hh
index 857cc0290bed6b01212c9ef4af336cdd0d484de8..55959d177f34f7a13f9939ccd4f3e2011587ceb1 100644 (file)
--- a/pdns/recursordist/logr.hh
+++ b/pdns/recursordist/logr.hh
@@ -175,4 +175,6 @@ private:
     return;
   }
 };
+
+using log_t = const std::shared_ptr<Logger>&;
 }

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index fbc5eacd670f65d0e2bbaba1f42c462188cf14f0..e1b43a860dd2e1aae42fcc64c34daf1d104aa32b 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -111,7 +111,7 @@ unsigned int RecThreadInfo::s_numDistributorThreads;
 unsigned int RecThreadInfo::s_numWorkerThreads;
 thread_local unsigned int RecThreadInfo::t_id;
 
-static std::map<unsigned int, std::set<int>> parseCPUMap(std::shared_ptr<Logr::Logger>& log)
+static std::map<unsigned int, std::set<int>> parseCPUMap(Logr::log_t log)
 {
   std::map<unsigned int, std::set<int>> result;
 
@@ -156,7 +156,7 @@ static std::map<unsigned int, std::set<int>> parseCPUMap(std::shared_ptr<Logr::L
   return result;
 }
 
-static void setCPUMap(const std::map<unsigned int, std::set<int>>& cpusMap, unsigned int n, pthread_t tid, std::shared_ptr<Logr::Logger>& log)
+static void setCPUMap(const std::map<unsigned int, std::set<int>>& cpusMap, unsigned int n, pthread_t tid, Logr::log_t log)
 {
   const auto& cpuMapping = cpusMap.find(n);
   if (cpuMapping == cpusMap.cend()) {
@@ -191,7 +191,7 @@ static void setCPUMap(const std::map<unsigned int, std::set<int>>& cpusMap, unsi
 
 static void recursorThread();
 
-void RecThreadInfo::start(unsigned int id, const string& tname, const std::map<unsigned int, std::set<int>>& cpusMap, std::shared_ptr<Logr::Logger>& log)
+void RecThreadInfo::start(unsigned int id, const string& tname, const std::map<unsigned int, std::set<int>>& cpusMap, Logr::log_t log)
 {
   name = tname;
   thread = std::thread([id, tname] {
@@ -203,7 +203,7 @@ void RecThreadInfo::start(unsigned int id, const string& tname, const std::map<u
   setCPUMap(cpusMap, id, thread.native_handle(), log);
 }
 
-int RecThreadInfo::runThreads(std::shared_ptr<Logr::Logger>& log)
+int RecThreadInfo::runThreads(Logr::log_t log)
 {
   int ret = EXIT_SUCCESS;
   unsigned int currentThreadId = 1;
@@ -291,7 +291,7 @@ int RecThreadInfo::runThreads(std::shared_ptr<Logr::Logger>& log)
   return ret;
 }
 
-void RecThreadInfo::makeThreadPipes(std::shared_ptr<Logr::Logger>& log)
+void RecThreadInfo::makeThreadPipes(Logr::log_t log)
 {
   auto pipeBufferSize = ::arg().asNum("distribution-pipe-buffer-size");
   if (pipeBufferSize > 0) {
@@ -352,7 +352,7 @@ ArgvMap& arg()
   return theArg;
 }
 
-static FDMultiplexer* getMultiplexer(std::shared_ptr<Logr::Logger>& log)
+static FDMultiplexer* getMultiplexer(Logr::log_t log)
 {
   FDMultiplexer* ret;
   for (const auto& i : FDMultiplexer::getMultiplexerMap()) {
@@ -670,7 +670,7 @@ static void makeControlChannelSocket(int processNum = -1)
   }
 }
 
-static void writePid(std::shared_ptr<Logr::Logger>& log)
+static void writePid(Logr::log_t log)
 {
   if (!::arg().mustDo("write-pid"))
     return;
@@ -684,7 +684,7 @@ static void writePid(std::shared_ptr<Logr::Logger>& log)
   }
 }
 
-static void checkSocketDir(std::shared_ptr<Logr::Logger>& log)
+static void checkSocketDir(Logr::log_t log)
 {
   struct stat st;
   string dir(::arg()["socket-dir"]);
@@ -708,7 +708,7 @@ static void checkSocketDir(std::shared_ptr<Logr::Logger>& log)
 }
 
 #ifdef NOD_ENABLED
-static void setupNODThread(std::shared_ptr<Logr::Logger>& log)
+static void setupNODThread(Logr::log_t log)
 {
   if (g_nodEnabled) {
     uint32_t num_cells = ::arg().asNum("new-domain-db-size");
@@ -776,7 +776,7 @@ static void setupNODGlobal()
 }
 #endif /* NOD_ENABLED */
 
-static void daemonize(std::shared_ptr<Logr::Logger>& log)
+static void daemonize(Logr::log_t log)
 {
   if (fork())
     exit(0); // bye bye
@@ -814,7 +814,7 @@ static void usr2Handler(int)
   ::arg().set("quiet") = g_quiet ? "" : "no";
 }
 
-static void checkLinuxIPv6Limits(std::shared_ptr<Logr::Logger>& log)
+static void checkLinuxIPv6Limits(Logr::log_t log)
 {
 #ifdef __linux__
   string line;
@@ -828,7 +828,7 @@ static void checkLinuxIPv6Limits(std::shared_ptr<Logr::Logger>& log)
 #endif
 }
 
-static void checkOrFixFDS(std::shared_ptr<Logr::Logger>& log)
+static void checkOrFixFDS(Logr::log_t log)
 {
   unsigned int availFDs = getFilenumLimit();
   unsigned int wantFDs = g_maxMThreads * RecThreadInfo::numWorkers() + 25; // even healthier margin then before
@@ -964,7 +964,7 @@ static void doStats(void)
   statsWanted = false;
 }
 
-static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const std::string& aclSetting, std::shared_ptr<Logr::Logger>& log)
+static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const std::string& aclSetting, Logr::log_t log)
 {
   auto result = std::make_shared<NetmaskGroup>();
 
@@ -1212,7 +1212,7 @@ template vector<ComboAddress> broadcastAccFunction(const std::function<vector<Co
 template vector<pair<DNSName, uint16_t>> broadcastAccFunction(const std::function<vector<pair<DNSName, uint16_t>>*()>& fun); // explicit instantiation
 template ThreadTimes broadcastAccFunction(const std::function<ThreadTimes*()>& fun);
 
-static int serviceMain(int argc, char* argv[], std::shared_ptr<Logr::Logger>& log)
+static int serviceMain(int argc, char* argv[], Logr::log_t log)
 {
   g_log.setName(g_programname);
   g_log.disableSyslog(::arg().mustDo("disable-syslog"));

diff --git a/pdns/recursordist/rec-main.hh b/pdns/recursordist/rec-main.hh
index 7fe9a1568d82fed33d78834d8ba9e621ef1430b3..94a9a903f3b99e1ef96f1e35b7bb550354c01a85 100644 (file)
--- a/pdns/recursordist/rec-main.hh
+++ b/pdns/recursordist/rec-main.hh
@@ -446,8 +446,8 @@ public:
     return numHandlers() + numDistributors() + numWorkers() + numTaskThreads();
   }
 
-  static int runThreads(std::shared_ptr<Logr::Logger>&);
-  static void makeThreadPipes(std::shared_ptr<Logr::Logger>&);
+  static int runThreads(Logr::log_t);
+  static void makeThreadPipes(Logr::log_t);
 
   void setExitCode(int e)
   {
@@ -468,7 +468,7 @@ public:
   uint64_t numberOfDistributedQueries{0};
 
 private:
-  void start(unsigned int id, const string& name, const std::map<unsigned int, std::set<int>>& cpusMap, std::shared_ptr<Logr::Logger>&);
+  void start(unsigned int id, const string& name, const std::map<unsigned int, std::set<int>>& cpusMap, Logr::log_t);
 
   std::string name;
   std::thread thread;
@@ -525,10 +525,10 @@ bool expectProxyProtocol(const ComboAddress& from);
 void finishTCPReply(std::unique_ptr<DNSComboWriter>& dc, bool hadError, bool updateInFlight);
 void checkFastOpenSysctl(bool active);
 void checkTFOconnect();
-void makeTCPServerSockets(deferredAdd_t& deferredAdds, std::set<int>& tcpSockets, std::shared_ptr<Logr::Logger>&);
+void makeTCPServerSockets(deferredAdd_t& deferredAdds, std::set<int>& tcpSockets, Logr::log_t);
 void handleNewTCPQuestion(int fd, FDMultiplexer::funcparam_t&);
 
-void makeUDPServerSockets(deferredAdd_t& deferredAdds, std::shared_ptr<Logr::Logger>&);
+void makeUDPServerSockets(deferredAdd_t& deferredAdds, Logr::log_t);
 
 #define LOCAL_NETS "127.0.0.0/8, 10.0.0.0/8, 100.64.0.0/10, 169.254.0.0/16, 192.168.0.0/16, 172.16.0.0/12, ::1/128, fc00::/7, fe80::/10"
 #define LOCAL_NETS_INVERSE "!127.0.0.0/8, !10.0.0.0/8, !100.64.0.0/10, !169.254.0.0/16, !192.168.0.0/16, !172.16.0.0/12, !::1/128, !fc00::/7, !fe80::/10"

diff --git a/pdns/recursordist/rec-tcp.cc b/pdns/recursordist/rec-tcp.cc
index 599350af59acc261198a72dcee2f0180a07336d7..52d5c0c909c65032cfc6a5a96291ee399742990c 100644 (file)
--- a/pdns/recursordist/rec-tcp.cc
+++ b/pdns/recursordist/rec-tcp.cc
@@ -994,7 +994,7 @@ LWResult::Result arecvtcp(PacketBuffer& data, const size_t len, shared_ptr<TCPIO
   return LWResult::Result::Success;
 }
 
-void makeTCPServerSockets(deferredAdd_t& deferredAdds, std::set<int>& tcpSockets, std::shared_ptr<Logr::Logger>& log)
+void makeTCPServerSockets(deferredAdd_t& deferredAdds, std::set<int>& tcpSockets, Logr::log_t log)
 {
   int fd;
   vector<string> locals;

diff --git a/pdns/recursordist/rec-zonetocache.cc b/pdns/recursordist/rec-zonetocache.cc
index 3918766ac5128173f4e3089d4aeb0411b2ff383a..ace86864642b12940a7216a806385c6b9ad36ebd 100644 (file)
--- a/pdns/recursordist/rec-zonetocache.cc
+++ b/pdns/recursordist/rec-zonetocache.cc
@@ -40,7 +40,7 @@
 
 struct ZoneData
 {
-  ZoneData(shared_ptr<Logr::Logger>& log, const std::string& zone) :
+  ZoneData(Logr::log_t log, const std::string& zone) :
     d_log(log),
     d_zone(zone),
     d_now(time(nullptr)) {}
@@ -53,7 +53,7 @@ struct ZoneData
   // Maybe use a SuffixMatchTree?
   std::set<DNSName> d_delegations;
 
-  shared_ptr<Logr::Logger>& d_log;
+  Logr::log_t d_log;
   DNSName d_zone;
   time_t d_now;
 

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index 24ca8cf4862ac7f42a841cca505185efc73d16da..67a2805aa3e401d633f36981ac843076fa3a1ae3 100644 (file)
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -197,7 +197,7 @@ void primeRootNSZones(DNSSECMode mode, unsigned int depth)
   }
 }
 
-static void makeNameToIPZone(std::shared_ptr<SyncRes::domainmap_t> newMap, const DNSName& hostname, const string& ip, std::shared_ptr<Logr::Logger>& log)
+static void makeNameToIPZone(std::shared_ptr<SyncRes::domainmap_t> newMap, const DNSName& hostname, const string& ip, Logr::log_t log)
 {
   SyncRes::AuthDomain ad;
   ad.d_rdForward = false;
@@ -234,7 +234,7 @@ static void makeNameToIPZone(std::shared_ptr<SyncRes::domainmap_t> newMap, const
 }
 
 //! parts[0] must be an IP address, the rest must be host names
-static void makeIPToNamesZone(std::shared_ptr<SyncRes::domainmap_t> newMap, const vector<string>& parts, std::shared_ptr<Logr::Logger>& log)
+static void makeIPToNamesZone(std::shared_ptr<SyncRes::domainmap_t> newMap, const vector<string>& parts, Logr::log_t log)
 {
   string address = parts[0];
   vector<string> ipparts;
@@ -283,7 +283,7 @@ static void makeIPToNamesZone(std::shared_ptr<SyncRes::domainmap_t> newMap, cons
   }
 }
 
-static void convertServersForAD(const std::string& zone, const std::string& input, SyncRes::AuthDomain& ad, const char* sepa, std::shared_ptr<Logr::Logger>& log, bool verbose = true)
+static void convertServersForAD(const std::string& zone, const std::string& input, SyncRes::AuthDomain& ad, const char* sepa, Logr::log_t log, bool verbose = true)
 {
   vector<string> servers;
   stringtok(servers, input, sepa);

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index d8350bdebebd6c517793750c3c9d2ec01241853c..b047182c6b23eac0be606743ab91b39a8561526a 100644 (file)
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -188,7 +188,7 @@ static void RPZRecordToPolicy(const DNSRecord& dr, std::shared_ptr<DNSFilterEngi
   }
 }
 
-static shared_ptr<SOARecordContent> loadRPZFromServer(const shared_ptr<Logr::Logger>& plogger, const ComboAddress& primary, const DNSName& zoneName, std::shared_ptr<DNSFilterEngine::Zone> zone, const boost::optional<DNSFilterEngine::Policy>& defpol, bool defpolOverrideLocal, uint32_t maxTTL, const TSIGTriplet& tt, size_t maxReceivedBytes, const ComboAddress& localAddress, uint16_t axfrTimeout)
+static shared_ptr<SOARecordContent> loadRPZFromServer(Logr::log_t plogger, const ComboAddress& primary, const DNSName& zoneName, std::shared_ptr<DNSFilterEngine::Zone> zone, const boost::optional<DNSFilterEngine::Policy>& defpol, bool defpolOverrideLocal, uint32_t maxTTL, const TSIGTriplet& tt, size_t maxReceivedBytes, const ComboAddress& localAddress, uint16_t axfrTimeout)
 {
 
   auto logger = plogger->withValues("primary", Logging::Loggable(primary));
@@ -319,7 +319,7 @@ std::shared_ptr<SOARecordContent> loadRPZFromFile(const std::string& fname, std:
   return sr;
 }
 
-static bool dumpZoneToDisk(const shared_ptr<Logr::Logger>& plogger, const DNSName& zoneName, const std::shared_ptr<DNSFilterEngine::Zone>& newZone, const std::string& dumpZoneFileName)
+static bool dumpZoneToDisk(Logr::log_t plogger, const DNSName& zoneName, const std::shared_ptr<DNSFilterEngine::Zone>& newZone, const std::string& dumpZoneFileName)
 {
   auto logger = plogger->v(1);
   logger->info("Dumping zone to disk", "destination_file", Logging::Loggable(dumpZoneFileName));

diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc
index be3d105d70dff26193b0d5f2ba20cf23ad527857..91774af85cf5aeabb167a91571ed58b310db2659 100644 (file)
--- a/pdns/secpoll-recursor.cc
+++ b/pdns/secpoll-recursor.cc
@@ -17,7 +17,7 @@
 uint32_t g_security_status;
 string g_security_message;
 
-void doSecPoll(time_t* last_secpoll, std::shared_ptr<Logr::Logger>& log)
+void doSecPoll(time_t* last_secpoll, Logr::log_t log)
 {
   if (::arg()["security-poll-suffix"].empty())
     return;

diff --git a/pdns/secpoll-recursor.hh b/pdns/secpoll-recursor.hh
index cfa77fa32077335518086b8a7ebae3c4df4d5264..8fc6f4074d1d3f62b5073668bf9720f85b44d4eb 100644 (file)
--- a/pdns/secpoll-recursor.hh
+++ b/pdns/secpoll-recursor.hh
@@ -25,6 +25,6 @@
 #include "logr.hh"
 #include <stdint.h>
 
-void doSecPoll(time_t*, std::shared_ptr<Logr::Logger>&);
+void doSecPoll(time_t*, Logr::log_t);
 extern uint32_t g_security_status;
 extern std::string g_security_message;

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 1c6ee2aa0fac017dad1f821f28d9ae75a9ae0f03..6a0c26b18229405c6cef1a9c7e3b8f44319b49b3 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -5670,7 +5670,7 @@ int directResolve(const DNSName& qname, const QType qtype, const QClass qclass,
   return res;
 }
 
-int SyncRes::getRootNS(struct timeval now, asyncresolve_t asyncCallback, unsigned int depth, std::shared_ptr<Logr::Logger>& log) {
+int SyncRes::getRootNS(struct timeval now, asyncresolve_t asyncCallback, unsigned int depth, Logr::log_t log) {
   SyncRes sr(now);
   sr.setDoEDNS0(true);
   sr.setUpdatingRootNS();

diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index a47365db72b16675777785088a8064bf6695f411..4ec3e519060716cf40a9c999851644135965e7bd 100644 (file)
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -184,7 +184,7 @@ public:
   static uint64_t doDumpSavedParentNSSets(int fd);
   static uint64_t doDumpDoTProbeMap(int fd);
 
-  static int getRootNS(struct timeval now, asyncresolve_t asyncCallback, unsigned int depth, std::shared_ptr<Logr::Logger>&);
+  static int getRootNS(struct timeval now, asyncresolve_t asyncCallback, unsigned int depth, Logr::log_t);
   static void addDontQuery(const std::string& mask)
   {
     if (!s_dontQuery)

diff --git a/pdns/validate-recursor.cc b/pdns/validate-recursor.cc
index 545b815ff08259147a910501f24176b25fae50fe..a8b0ae87554adbe44dac7112a4544c10cde20295 100644 (file)
--- a/pdns/validate-recursor.cc
+++ b/pdns/validate-recursor.cc
@@ -41,7 +41,7 @@ vState increaseXDNSSECStateCounter(const vState& state)
 }
 
 // Returns true if dsAnchors were modified
-bool updateTrustAnchorsFromFile(const std::string& fname, map<DNSName, dsmap_t>& dsAnchors, std::shared_ptr<Logr::Logger>& log)
+bool updateTrustAnchorsFromFile(const std::string& fname, map<DNSName, dsmap_t>& dsAnchors, Logr::log_t log)
 {
   map<DNSName, dsmap_t> newDSAnchors;
   try {

diff --git a/pdns/validate-recursor.hh b/pdns/validate-recursor.hh
index a45304a47735149e33a48773e4db59dd88de167a..70621628324c8ece641fe6e5213cdbe9a7082d29 100644 (file)
--- a/pdns/validate-recursor.hh
+++ b/pdns/validate-recursor.hh
@@ -46,4 +46,4 @@ bool checkDNSSECDisabled();
 bool warnIfDNSSECDisabled(const string& msg);
 vState increaseDNSSECStateCounter(const vState& state);
 vState increaseXDNSSECStateCounter(const vState& state);
-bool updateTrustAnchorsFromFile(const std::string& fname, map<DNSName, dsmap_t>& dsAnchors, std::shared_ptr<Logr::Logger>&);
+bool updateTrustAnchorsFromFile(const std::string& fname, map<DNSName, dsmap_t>& dsAnchors, Logr::log_t);