dnsdist: Pass shared pointers by reference whenever possible

diff --git a/pdns/dnscrypt.cc b/pdns/dnscrypt.cc
index 1f7456348739834b69a0f3dbd281201bcf7b6231..f81263c09fcbbb2d5445a5f582eec1b566b98aa7 100644 (file)
--- a/pdns/dnscrypt.cc
+++ b/pdns/dnscrypt.cc
@@ -713,7 +713,7 @@ int DNSCryptQuery::encryptResponse(char* response, uint16_t responseLen, uint16_
   return res;
 }
 
-int DNSCryptContext::encryptQuery(char* query, uint16_t queryLen, uint16_t querySize, const unsigned char clientPublicKey[DNSCRYPT_PUBLIC_KEY_SIZE], const DNSCryptPrivateKey& clientPrivateKey, const unsigned char clientNonce[DNSCRYPT_NONCE_SIZE / 2], bool tcp, uint16_t* encryptedResponseLen, const std::shared_ptr<DNSCryptCert> cert) const
+int DNSCryptContext::encryptQuery(char* query, uint16_t queryLen, uint16_t querySize, const unsigned char clientPublicKey[DNSCRYPT_PUBLIC_KEY_SIZE], const DNSCryptPrivateKey& clientPrivateKey, const unsigned char clientNonce[DNSCRYPT_NONCE_SIZE / 2], bool tcp, uint16_t* encryptedResponseLen, const std::shared_ptr<DNSCryptCert>& cert) const
 {
   assert(query != nullptr);
   assert(queryLen > 0);

diff --git a/pdns/dnscrypt.hh b/pdns/dnscrypt.hh
index fea11f0c7f8abfa70154fcc653d2eb39d0804770..acdad413b22303ed41fa485b98ff8cda7948fe17 100644 (file)
--- a/pdns/dnscrypt.hh
+++ b/pdns/dnscrypt.hh
@@ -152,7 +152,7 @@ struct DNSCryptCertificatePair
 class DNSCryptQuery
 {
 public:
-  DNSCryptQuery(std::shared_ptr<DNSCryptContext> ctx): d_ctx(ctx)
+  DNSCryptQuery(const std::shared_ptr<DNSCryptContext>& ctx): d_ctx(ctx)
   {
   }
   ~DNSCryptQuery();
@@ -182,7 +182,7 @@ public:
     return d_encrypted;
   }
 
-  void setCertificatePair(std::shared_ptr<DNSCryptCertificatePair> pair)
+  void setCertificatePair(const std::shared_ptr<DNSCryptCertificatePair>& pair)
   {
     d_pair = pair;
   }
@@ -213,7 +213,7 @@ private:
   std::shared_ptr<DNSCryptCertificatePair> d_pair{nullptr};
   uint16_t d_id{0};
   uint16_t d_len{0};
-  uint16_t d_paddedLen;
+  uint16_t d_paddedLen{0};
   bool d_encrypted{false};
   bool d_valid{false};
 
@@ -246,7 +246,7 @@ public:
   std::vector<std::shared_ptr<DNSCryptCertificatePair>> getCertificates() { return certs; };
   const DNSName& getProviderName() const { return providerName; }
 
-  int encryptQuery(char* query, uint16_t queryLen, uint16_t querySize, const unsigned char clientPublicKey[DNSCRYPT_PUBLIC_KEY_SIZE], const DNSCryptPrivateKey& clientPrivateKey, const unsigned char clientNonce[DNSCRYPT_NONCE_SIZE / 2], bool tcp, uint16_t* encryptedResponseLen, const std::shared_ptr<DNSCryptCert> cert) const;
+  int encryptQuery(char* query, uint16_t queryLen, uint16_t querySize, const unsigned char clientPublicKey[DNSCRYPT_PUBLIC_KEY_SIZE], const DNSCryptPrivateKey& clientPrivateKey, const unsigned char clientNonce[DNSCRYPT_NONCE_SIZE / 2], bool tcp, uint16_t* encryptedResponseLen, const std::shared_ptr<DNSCryptCert>& cert) const;
   bool magicMatchesAPublicKey(DNSCryptQuery& query, time_t now);
   void getCertificateResponse(time_t now, const DNSName& qname, uint16_t qid, std::vector<uint8_t>& response);
 

diff --git a/pdns/dnsdist-dynbpf.hh b/pdns/dnsdist-dynbpf.hh
index 3fed6f18cbf34a55ea5620e656ac5930529a197a..321e930beace6485b04889fcb099692946bb52d3 100644 (file)
--- a/pdns/dnsdist-dynbpf.hh
+++ b/pdns/dnsdist-dynbpf.hh
@@ -35,7 +35,7 @@
 class DynBPFFilter
 {
 public:
-  DynBPFFilter(std::shared_ptr<BPFFilter> bpf): d_bpf(bpf)
+  DynBPFFilter(std::shared_ptr<BPFFilter>& bpf): d_bpf(bpf)
   {
   }
   ~DynBPFFilter()

diff --git a/pdns/dnsdist-lua-actions.cc b/pdns/dnsdist-lua-actions.cc
index fa937924ac5c851e380a8c59355a965806f783d0..7df6aa8df6a63f599b65edc83e77043a8eefa192 100644 (file)
--- a/pdns/dnsdist-lua-actions.cc
+++ b/pdns/dnsdist-lua-actions.cc
@@ -651,7 +651,7 @@ public:
 class DnstapLogAction : public DNSAction, public boost::noncopyable
 {
 public:
-  DnstapLogAction(const std::string& identity, std::shared_ptr<RemoteLoggerInterface> logger, boost::optional<std::function<void(const DNSQuestion&, DnstapMessage*)> > alterFunc): d_identity(identity), d_logger(logger), d_alterFunc(alterFunc)
+  DnstapLogAction(const std::string& identity, std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(const DNSQuestion&, DnstapMessage*)> > alterFunc): d_identity(identity), d_logger(logger), d_alterFunc(alterFunc)
   {
   }
   DNSAction::Action operator()(DNSQuestion* dq, string* ruleresult) const override
@@ -683,7 +683,7 @@ private:
 class RemoteLogAction : public DNSAction, public boost::noncopyable
 {
 public:
-  RemoteLogAction(std::shared_ptr<RemoteLoggerInterface> logger, boost::optional<std::function<void(const DNSQuestion&, DNSDistProtoBufMessage*)> > alterFunc): d_logger(logger), d_alterFunc(alterFunc)
+  RemoteLogAction(std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(const DNSQuestion&, DNSDistProtoBufMessage*)> > alterFunc): d_logger(logger), d_alterFunc(alterFunc)
   {
   }
   DNSAction::Action operator()(DNSQuestion* dq, string* ruleresult) const override
@@ -740,7 +740,7 @@ private:
 class TagAction : public DNSAction
 {
 public:
-  TagAction(const std::string tag, const std::string value): d_tag(tag), d_value(value)
+  TagAction(const std::string& tag, const std::string& value): d_tag(tag), d_value(value)
   {
   }
   DNSAction::Action operator()(DNSQuestion* dq, string* ruleresult) const override
@@ -765,7 +765,7 @@ private:
 class DnstapLogResponseAction : public DNSResponseAction, public boost::noncopyable
 {
 public:
-  DnstapLogResponseAction(const std::string& identity, std::shared_ptr<RemoteLoggerInterface> logger, boost::optional<std::function<void(const DNSResponse&, DnstapMessage*)> > alterFunc): d_identity(identity), d_logger(logger), d_alterFunc(alterFunc)
+  DnstapLogResponseAction(const std::string& identity, std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(const DNSResponse&, DnstapMessage*)> > alterFunc): d_identity(identity), d_logger(logger), d_alterFunc(alterFunc)
   {
   }
   DNSResponseAction::Action operator()(DNSResponse* dr, string* ruleresult) const override
@@ -799,7 +799,7 @@ private:
 class RemoteLogResponseAction : public DNSResponseAction, public boost::noncopyable
 {
 public:
-  RemoteLogResponseAction(std::shared_ptr<RemoteLoggerInterface> logger, boost::optional<std::function<void(const DNSResponse&, DNSDistProtoBufMessage*)> > alterFunc, bool includeCNAME): d_logger(logger), d_alterFunc(alterFunc), d_includeCNAME(includeCNAME)
+  RemoteLogResponseAction(std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(const DNSResponse&, DNSDistProtoBufMessage*)> > alterFunc, bool includeCNAME): d_logger(logger), d_alterFunc(alterFunc), d_includeCNAME(includeCNAME)
   {
   }
   DNSResponseAction::Action operator()(DNSResponse* dr, string* ruleresult) const override
@@ -901,7 +901,7 @@ private:
 class TagResponseAction : public DNSResponseAction
 {
 public:
-  TagResponseAction(const std::string tag, const std::string value): d_tag(tag), d_value(value)
+  TagResponseAction(const std::string& tag, const std::string& value): d_tag(tag), d_value(value)
   {
   }
   DNSResponseAction::Action operator()(DNSResponse* dr, string* ruleresult) const override

diff --git a/pdns/dnsdist-lua-rules.cc b/pdns/dnsdist-lua-rules.cc
index 9ae95466deaebc4c23bd94dc44fa9d79b6e0bb49..66d66d71c305e81161e08a9fc662acc6873c0766 100644 (file)
--- a/pdns/dnsdist-lua-rules.cc
+++ b/pdns/dnsdist-lua-rules.cc
@@ -826,7 +826,7 @@ private:
 class TagRule : public DNSRule
 {
 public:
-  TagRule(std::string tag, boost::optional<std::string> value) : d_value(value), d_tag(tag)
+  TagRule(const std::string& tag, boost::optional<std::string> value) : d_value(value), d_tag(tag)
   {
   }
   bool matches(const DNSQuestion* dq) const override

diff --git a/pdns/dnsdist-lua.hh b/pdns/dnsdist-lua.hh
index 19c5f39655502bfaa2faaa161b767416aa2c1a72..bf3a921be91d36250f04f82e85781d3c950d420b 100644 (file)
--- a/pdns/dnsdist-lua.hh
+++ b/pdns/dnsdist-lua.hh
@@ -25,7 +25,7 @@ class LuaAction : public DNSAction
 {
 public:
   typedef std::function<std::tuple<int, boost::optional<string> >(DNSQuestion* dq)> func_t;
-  LuaAction(LuaAction::func_t func) : d_func(func)
+  LuaAction(LuaAction::func_t& func) : d_func(func)
   {}
   Action operator()(DNSQuestion* dq, string* ruleresult) const override;
   string toString() const override
@@ -40,7 +40,7 @@ class LuaResponseAction : public DNSResponseAction
 {
 public:
   typedef std::function<std::tuple<int, boost::optional<string> >(DNSResponse* dr)> func_t;
-  LuaResponseAction(LuaResponseAction::func_t func) : d_func(func)
+  LuaResponseAction(LuaResponseAction::func_t& func) : d_func(func)
   {}
   Action operator()(DNSResponse* dr, string* ruleresult) const override;
   string toString() const override

diff --git a/pdns/dnsdist-snmp.cc b/pdns/dnsdist-snmp.cc
index ec9683f4580944848498003ddeff6b7221d34283..f0444518372a016da26e45e79e523faa1a8d11fd 100644 (file)
--- a/pdns/dnsdist-snmp.cc
+++ b/pdns/dnsdist-snmp.cc
@@ -367,7 +367,7 @@ static int backendStatTable_handler(netsnmp_mib_handler* handler,
 }
 #endif /* HAVE_NET_SNMP */
 
-bool DNSDistSNMPAgent::sendBackendStatusChangeTrap(const std::shared_ptr<DownstreamState> dss)
+bool DNSDistSNMPAgent::sendBackendStatusChangeTrap(const std::shared_ptr<DownstreamState>& dss)
 {
 #ifdef HAVE_NET_SNMP
   const string backendAddress = dss->remote.toStringWithPort();

diff --git a/pdns/dnsdist-snmp.hh b/pdns/dnsdist-snmp.hh
index bced61aab0628bac6cb5f9c5f4e1b7d95519b5ae..b04518286e6a206e52b322923baa50e8972c778a 100644 (file)
--- a/pdns/dnsdist-snmp.hh
+++ b/pdns/dnsdist-snmp.hh
@@ -13,7 +13,7 @@ class DNSDistSNMPAgent: public SNMPAgent
 {
 public:
   DNSDistSNMPAgent(const std::string& name, const std::string& masterSocket);
-  bool sendBackendStatusChangeTrap(const std::shared_ptr<DownstreamState>);
+  bool sendBackendStatusChangeTrap(const std::shared_ptr<DownstreamState>&);
   bool sendCustomTrap(const std::string& reason);
   bool sendDNSTrap(const DNSQuestion&, const std::string& reason="");
 };

diff --git a/pdns/dnsdistdist/tcpiohandler.cc b/pdns/dnsdistdist/tcpiohandler.cc
index f2dddc98b37e9a474b1dc24653db1c3582ab9ab6..4f8d11e12d3205b422156a0679c2fd2e3e3547a0 100644 (file)
--- a/pdns/dnsdistdist/tcpiohandler.cc
+++ b/pdns/dnsdistdist/tcpiohandler.cc
@@ -613,7 +613,7 @@ class GnuTLSConnection: public TLSConnection
 {
 public:
 
-  GnuTLSConnection(int socket, unsigned int timeout, const gnutls_certificate_credentials_t creds, const gnutls_priority_t priorityCache, std::shared_ptr<GnuTLSTicketsKey> ticketsKey): d_ticketsKey(ticketsKey)
+  GnuTLSConnection(int socket, unsigned int timeout, const gnutls_certificate_credentials_t creds, const gnutls_priority_t priorityCache, std::shared_ptr<GnuTLSTicketsKey>& ticketsKey): d_ticketsKey(ticketsKey)
   {
     d_socket = socket;