aboutsummaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Sadie Powell2023-01-10 21:39:08 +0000
committerGravatar Sadie Powell2023-01-10 21:39:08 +0000
commit396f2ab29076ca8ce94336813af4d6a8d94ecad5 (patch)
tree23cbb63e4bdc4fbff894bed1491695bc0696e584 /src/modules
parentAvoid copying shared_ptr<IOHookProvider> when not necessary. (diff)
Avoid copying various shared_ptr usages when not necessary.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp4
-rw-r--r--src/modules/m_spanningtree/main.cpp8
-rw-r--r--src/modules/m_spanningtree/main.h4
-rw-r--r--src/modules/m_spanningtree/override_stats.cpp2
-rw-r--r--src/modules/m_spanningtree/resolvers.cpp6
-rw-r--r--src/modules/m_spanningtree/resolvers.h4
-rw-r--r--src/modules/m_spanningtree/server.cpp2
-rw-r--r--src/modules/m_spanningtree/treesocket.h2
-rw-r--r--src/modules/m_spanningtree/treesocket1.cpp2
-rw-r--r--src/modules/m_spanningtree/utils.cpp4
10 files changed, 19 insertions, 19 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 30b69a721..a0dc20561 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -356,7 +356,7 @@ namespace GnuTLS
#ifndef GNUTLS_AUTO_DH
/** Set the given DH parameters to be used with these credentials
*/
- void SetDH(std::shared_ptr<DHParams>& DH)
+ void SetDH(const std::shared_ptr<DHParams>& DH)
{
dh = DH;
gnutls_certificate_set_dh_params(cred, dh->get());
@@ -400,7 +400,7 @@ namespace GnuTLS
/** Sets the trusted CA and the certificate revocation list
* to use when verifying certificates
*/
- void SetCA(std::shared_ptr<X509CertList>& certlist, std::shared_ptr<X509CRL>& CRL)
+ void SetCA(const std::shared_ptr<X509CertList>& certlist, const std::shared_ptr<X509CRL>& CRL)
{
// Do nothing if certlist is NULL
if (certlist.get())
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 070f4815c..d7406aeb0 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -175,7 +175,7 @@ void ModuleSpanningTree::HandleLinks(const CommandBase::Params& parameters, User
user->WriteNumeric(RPL_ENDOFLINKS, '*', "End of /LINKS list.");
}
-void ModuleSpanningTree::ConnectServer(std::shared_ptr<Autoconnect> a, bool on_timer)
+void ModuleSpanningTree::ConnectServer(const std::shared_ptr<Autoconnect>& a, bool on_timer)
{
if (!a)
return;
@@ -212,7 +212,7 @@ void ModuleSpanningTree::ConnectServer(std::shared_ptr<Autoconnect> a, bool on_t
a->position = -1;
}
-void ModuleSpanningTree::ConnectServer(std::shared_ptr<Link> x, std::shared_ptr<Autoconnect> y)
+void ModuleSpanningTree::ConnectServer(const std::shared_ptr<Link>& x, const std::shared_ptr<Autoconnect>& y)
{
if (InspIRCd::Match(ServerInstance->Config->ServerName, x->Name, ascii_case_insensitive_map))
{
@@ -281,7 +281,7 @@ void ModuleSpanningTree::ConnectServer(std::shared_ptr<Link> x, std::shared_ptr<
void ModuleSpanningTree::AutoConnectServers(time_t curtime)
{
- for (std::shared_ptr<Autoconnect> x : Utils->AutoconnectBlocks)
+ for (const auto& x : Utils->AutoconnectBlocks)
{
if (curtime >= x->NextConnectTime)
{
@@ -350,7 +350,7 @@ ModResult ModuleSpanningTree::HandleVersion(const CommandBase::Params& parameter
ModResult ModuleSpanningTree::HandleConnect(const CommandBase::Params& parameters, User* user)
{
- for (std::shared_ptr<Link> x : Utils->LinkBlocks)
+ for (const auto& x : Utils->LinkBlocks)
{
if (InspIRCd::Match(x->Name, parameters[0], ascii_case_insensitive_map))
{
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 7f70864b8..e51687992 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -154,11 +154,11 @@ public:
/** Connect a server locally
*/
- void ConnectServer(std::shared_ptr<Link> x, std::shared_ptr<Autoconnect> y = nullptr);
+ void ConnectServer(const std::shared_ptr<Link>& x, const std::shared_ptr<Autoconnect>& y = nullptr);
/** Connect the next autoconnect server
*/
- void ConnectServer(std::shared_ptr<Autoconnect> y, bool on_timer);
+ void ConnectServer(const std::shared_ptr<Autoconnect>& y, bool on_timer);
/** Check if any servers are due to be autoconnected
*/
diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp
index c072d9128..b15052511 100644
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -30,7 +30,7 @@ ModResult ModuleSpanningTree::OnStats(Stats::Context& stats)
{
if ((stats.GetSymbol() == 'c') || (stats.GetSymbol() == 'n'))
{
- for (std::shared_ptr<Link> L : Utils->LinkBlocks)
+ for (const auto& L : Utils->LinkBlocks)
{
std::string ipaddr = "*@";
if (L->HiddenFromStats)
diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index 555bb22bd..4d83c642c 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -34,7 +34,7 @@
#include "link.h"
#include "treesocket.h"
-ServerNameResolver::ServerNameResolver(DNS::Manager* mgr, const std::string& hostname, std::shared_ptr<Link> l, DNS::QueryType qt, std::shared_ptr<Autoconnect> a)
+ServerNameResolver::ServerNameResolver(DNS::Manager* mgr, const std::string& hostname, const std::shared_ptr<Link>& l, DNS::QueryType qt, const std::shared_ptr<Autoconnect>& a)
: DNS::Request(mgr, Utils->Creator, hostname, qt)
, autoconnect(a)
, link(l)
@@ -103,7 +103,7 @@ void ServerNameResolver::OnError(const DNS::Query* r)
Utils->Creator->ConnectServer(autoconnect, false);
}
-SecurityIPResolver::SecurityIPResolver(Module* me, DNS::Manager* mgr, const std::string& hostname, std::shared_ptr<Link> l, DNS::QueryType qt)
+SecurityIPResolver::SecurityIPResolver(Module* me, DNS::Manager* mgr, const std::string& hostname, const std::shared_ptr<Link>& l, DNS::QueryType qt)
: DNS::Request(mgr, me, hostname, qt)
, link(l)
{
@@ -130,7 +130,7 @@ bool SecurityIPResolver::CheckIPv4()
void SecurityIPResolver::OnLookupComplete(const DNS::Query* r)
{
- for (std::shared_ptr<Link> L : Utils->LinkBlocks)
+ for (const auto& L : Utils->LinkBlocks)
{
if (L->IPAddr == question.name)
{
diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index 8403ab9db..2779b6478 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -40,7 +40,7 @@ private:
bool CheckIPv4();
public:
- SecurityIPResolver(Module* mod, DNS::Manager* mgr, const std::string& hostname, std::shared_ptr<Link> l, DNS::QueryType qt);
+ SecurityIPResolver(Module* mod, DNS::Manager* mgr, const std::string& hostname, const std::shared_ptr<Link>& l, DNS::QueryType qt);
void OnLookupComplete(const DNS::Query* r) override;
void OnError(const DNS::Query* q) override;
};
@@ -54,7 +54,7 @@ private:
std::shared_ptr<Link> link;
public:
- ServerNameResolver(DNS::Manager* mgr, const std::string& hostname, std::shared_ptr<Link> l, DNS::QueryType qt, std::shared_ptr<Autoconnect> a);
+ ServerNameResolver(DNS::Manager* mgr, const std::string& hostname, const std::shared_ptr<Link>& l, DNS::QueryType qt, const std::shared_ptr<Autoconnect>& a);
void OnLookupComplete(const DNS::Query* r) override;
void OnError(const DNS::Query* q) override;
};
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index f3dcb49bd..9a8a76449 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -117,7 +117,7 @@ std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
return nullptr;
}
- for (std::shared_ptr<Link> x : Utils->LinkBlocks)
+ for (const auto& x : Utils->LinkBlocks)
{
if (!InspIRCd::Match(sname, x->Name))
continue;
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 80d7b336c..497d0b46b 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -190,7 +190,7 @@ public:
* most of the action, and append a few of our own values
* to it.
*/
- TreeSocket(std::shared_ptr<Link> link, std::shared_ptr<Autoconnect> myac, const irc::sockets::sockaddrs& sa);
+ TreeSocket(const std::shared_ptr<Link>& link, const std::shared_ptr<Autoconnect>& myac, const irc::sockets::sockaddrs& sa);
/** When a listening socket gives us a new file descriptor,
* we must associate it with a socket without creating a new
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 8bd29876f..37de1adc8 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -38,7 +38,7 @@
* BufferedSocket, we just call DoConnect() for most of the action,
* and only do minor initialization tasks ourselves.
*/
-TreeSocket::TreeSocket(std::shared_ptr<Link> link, std::shared_ptr<Autoconnect> myac, const irc::sockets::sockaddrs& dest)
+TreeSocket::TreeSocket(const std::shared_ptr<Link>& link, const std::shared_ptr<Autoconnect>& myac, const irc::sockets::sockaddrs& dest)
: linkID(link->Name)
, LinkState(CONNECTING)
, capab(std::make_unique<CapabData>(dest))
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 8024b9d27..06804c0ec 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -200,7 +200,7 @@ void SpanningTreeUtilities::DoOneToOne(const CmdBuilder& params, const Server* s
void SpanningTreeUtilities::RefreshIPCache()
{
ValidIPs.clear();
- for (std::shared_ptr<Link> L : LinkBlocks)
+ for (const auto& L : LinkBlocks)
{
bool isunix = L->IPAddr.find('/') != std::string::npos;
if (!L->Port && !isunix)
@@ -343,7 +343,7 @@ void SpanningTreeUtilities::ReadConfiguration()
std::shared_ptr<Link> SpanningTreeUtilities::FindLink(const std::string& name)
{
- for (std::shared_ptr<Link> x : LinkBlocks)
+ for (const auto& x : LinkBlocks)
{
if (InspIRCd::Match(x->Name, name, ascii_case_insensitive_map))
{