Replace ModuleSpanningTree::TimeToStr with InspIRCd::DurationStr.

[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 1228e375feace036c2ad9389eaa6c05f2aa8dc54..b20b100dd2f6bd63f29d36613ef3769a3e61936d 100644 (file)
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -49,14 +49,22 @@ void ServernameResolver::OnLookupComplete(const DNS::Query *r)
                return;
        }
 
+       irc::sockets::sockaddrs sa;
+       if (!irc::sockets::aptosa(ans_record->rdata, MyLink->Port, sa))
+       {
+               // We had a result but it wasn't a valid IPv4/IPv6.
+               OnError(r);
+               return;
+       }
+
        /* Initiate the connection, now that we have an IP to use.
         * Passing a hostname directly to BufferedSocket causes it to
         * just bail and set its FD to -1.
         */
-       TreeServer* CheckDupe = Utils->FindServer(MyLink->Name.c_str());
+       TreeServer* CheckDupe = Utils->FindServer(MyLink->Name);
        if (!CheckDupe) /* Check that nobody tried to connect it successfully while we were resolving */
        {
-               TreeSocket* newsocket = new TreeSocket(MyLink, myautoconnect, ans_record->rdata);
+               TreeSocket* newsocket = new TreeSocket(MyLink, myautoconnect, sa);
                if (newsocket->GetFd() > -1)
                {
                        /* We're all OK */
@@ -105,14 +113,17 @@ SecurityIPResolver::SecurityIPResolver(Module* me, DNS::Manager* mgr, const std:
 
 void SecurityIPResolver::OnLookupComplete(const DNS::Query *r)
 {
-       const DNS::ResourceRecord &ans_record = r->answers[0];
-
        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(ans_record.rdata);
+                       for (std::vector<DNS::ResourceRecord>::const_iterator j = r->answers.begin(); j != r->answers.end(); ++j)
+                       {
+                               const DNS::ResourceRecord& ans_record = *j;
+                               if (ans_record.type == this->question.type)
+                                       Utils->ValidIPs.push_back(ans_record.rdata);
+                       }
                        break;
                }
        }