Add HasFd to EventHandler and switch code to use it.

[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 ded0573afeec2c50cd2b069f4bea63e674bfd6f9..14a96933d97e524cf84468361a6dc5d07b563cfe 100644 (file)
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -1,8 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2016 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -49,6 +55,14 @@ 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.
@@ -56,12 +70,8 @@ void ServernameResolver::OnLookupComplete(const DNS::Query *r)
        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);
-               if (newsocket->GetFd() > -1)
-               {
-                       /* We're all OK */
-               }
-               else
+               TreeSocket* newsocket = new TreeSocket(MyLink, myautoconnect, sa);
+               if (!newsocket->HasFd())
                {
                        /* Something barfed, show the opers */
                        ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",