Merge pull request #495 from SaberUK/master+fix-libcpp

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / resolvers.cpp

diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index be185a28fbfa0c09bcc319d5f36532af916cfd14..b0be2cd60fe82594ae7e64fb7a10aa03874151b7 100644 (file)
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -19,8 +19,6 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
 
 #include "resolvers.h"
 #include "main.h"
@@ -71,7 +69,7 @@ void ServernameResolver::OnError(ResolverError e, const std::string &errormessag
        /* Ooops! */
        if (query == DNS_QUERY_AAAA)
        {
-               bool cached;
+               bool cached = false;
                ServernameResolver* snr = new ServernameResolver(Utils, host, MyLink, cached, DNS_QUERY_A, myautoconnect);
                ServerInstance->AddResolver(snr, cached);
                return;
@@ -87,18 +85,26 @@ SecurityIPResolver::SecurityIPResolver(Module* me, SpanningTreeUtilities* U, con
 
 void SecurityIPResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 {
-       Utils->ValidIPs.push_back(result);
+       for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i != Utils->LinkBlocks.end(); ++i)
+       {
+               Link* L = *i;
+               if (L->IPAddr == host)
+               {
+                       Utils->ValidIPs.push_back(result);
+                       break;
+               }
+       }
 }
 
 void SecurityIPResolver::OnError(ResolverError e, const std::string &errormessage)
 {
        if (query == DNS_QUERY_AAAA)
        {
-               bool cached;
+               bool cached = false;
                SecurityIPResolver* res = new SecurityIPResolver(mine, Utils, host, MyLink, cached, DNS_QUERY_A);
                ServerInstance->AddResolver(res, cached);
                return;
        }
-       ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Could not resolve IP associated with Link '%s': %s",
+       ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Could not resolve IP associated with Link '%s': %s",
                MyLink->Name.c_str(),errormessage.c_str());
 }