From 23f49c1192e08adea954281e84674d4393ed9831 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sun, 12 Apr 2020 20:56:51 +0100
Subject: Switch the spanningtree module from reference<> to std::shared_ptr<>.
---
src/modules/m_spanningtree/resolvers.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
(limited to 'src/modules/m_spanningtree/resolvers.cpp')
diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index 50cef5aa1..7085fa278 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -40,7 +40,7 @@
* callback to OnLookupComplete or OnError when completed. Once it has completed we
* will have an IP address which we can then use to continue our connection.
*/
-ServernameResolver::ServernameResolver(DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt, Autoconnect* myac)
+ServernameResolver::ServernameResolver(DNS::Manager* mgr, const std::string& hostname, std::shared_ptr x, DNS::QueryType qt, std::shared_ptr myac)
: DNS::Request(mgr, Utils->Creator, hostname, qt)
, query(qt), host(hostname), MyLink(x), myautoconnect(myac)
{
@@ -107,7 +107,7 @@ void ServernameResolver::OnError(const DNS::Query *r)
Utils->Creator->ConnectServer(myautoconnect, false);
}
-SecurityIPResolver::SecurityIPResolver(Module* me, DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt)
+SecurityIPResolver::SecurityIPResolver(Module* me, DNS::Manager* mgr, const std::string& hostname, std::shared_ptr x, DNS::QueryType qt)
: DNS::Request(mgr, me, hostname, qt)
, MyLink(x), mine(me), host(hostname), query(qt)
{
@@ -115,9 +115,8 @@ SecurityIPResolver::SecurityIPResolver(Module* me, DNS::Manager* mgr, const std:
void SecurityIPResolver::OnLookupComplete(const DNS::Query *r)
{
- for (std::vector >::iterator i = Utils->LinkBlocks.begin(); i != Utils->LinkBlocks.end(); ++i)
+ for (std::shared_ptr L : Utils->LinkBlocks)
{
- Link* L = *i;
if (L->IPAddr == host)
{
for (std::vector::const_iterator j = r->answers.begin(); j != r->answers.end(); ++j)
--
cgit v1.3.1-10-gc9f91