aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree/resolvers.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-04-12 20:56:51 +0100
committerGravatar Sadie Powell2020-04-13 23:32:39 +0100
commit23f49c1192e08adea954281e84674d4393ed9831 (patch)
treef3716dc0e66bc1c08a38c4dc3d665b430c345ac9 /src/modules/m_spanningtree/resolvers.cpp
parentSwitch the dnsbl module from reference<> to std::shared_ptr<>. (diff)
Switch the spanningtree module from reference<> to std::shared_ptr<>.
Diffstat (limited to 'src/modules/m_spanningtree/resolvers.cpp')
-rw-r--r--src/modules/m_spanningtree/resolvers.cpp7
1 files changed, 3 insertions, 4 deletions
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<Link> x, DNS::QueryType qt, std::shared_ptr<Autoconnect> 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<Link> 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<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i != Utils->LinkBlocks.end(); ++i)
+ for (std::shared_ptr<Link> L : Utils->LinkBlocks)
{
- Link* L = *i;
if (L->IPAddr == host)
{
for (std::vector<DNS::ResourceRecord>::const_iterator j = r->answers.begin(); j != r->answers.end(); ++j)