X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fresolvers.cpp;h=b0be2cd60fe82594ae7e64fb7a10aa03874151b7;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=b95ba79c3dff1aa3eee8b64a8ff8d2a36155ceeb;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index b95ba79c3..b0be2cd60 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -1,19 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
 
 #include "resolvers.h"
 #include "main.h"
@@ -44,8 +49,7 @@ void ServernameResolver::OnLookupComplete(const std::string &result, unsigned in
 	TreeServer* CheckDupe = Utils->FindServer(MyLink->Name.c_str());
 	if (!CheckDupe) /* Check that nobody tried to connect it successfully while we were resolving */
 	{
-		TreeSocket* newsocket = new TreeSocket(Utils, result, MyLink->Port, MyLink->Timeout ? MyLink->Timeout : 10,
-			MyLink->Name.c_str(), MyLink->Bind, myautoconnect, MyLink->Hook);
+		TreeSocket* newsocket = new TreeSocket(Utils, MyLink, myautoconnect, result);
 		if (newsocket->GetFd() > -1)
 		{
 			/* We're all OK */
@@ -53,9 +57,9 @@ void ServernameResolver::OnLookupComplete(const std::string &result, unsigned in
 		else
 		{
 			/* Something barfed, show the opers */
-			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",MyLink->Name.c_str(),strerror(errno));
+			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",
+				MyLink->Name.c_str(), newsocket->getError().c_str());
 			ServerInstance->GlobalCulls.AddItem(newsocket);
-			Utils->Creator->ConnectServer(myautoconnect);
 		}
 	}
 }
@@ -65,12 +69,42 @@ 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;
 	}
 	ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s", MyLink->Name.c_str(), errormessage.c_str() );
-	Utils->Creator->ConnectServer(myautoconnect);
+	Utils->Creator->ConnectServer(myautoconnect, false);
+}
+
+SecurityIPResolver::SecurityIPResolver(Module* me, SpanningTreeUtilities* U, const std::string &hostname, Link* x, bool &cached, QueryType qt)
+		: Resolver(hostname, qt, cached, me), MyLink(x), Utils(U), mine(me), host(hostname), query(qt)
+{
+}
+
+void SecurityIPResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+{
+	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 = false;
+		SecurityIPResolver* res = new SecurityIPResolver(mine, Utils, host, MyLink, cached, DNS_QUERY_A);
+		ServerInstance->AddResolver(res, cached);
+		return;
+	}
+	ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Could not resolve IP associated with Link '%s': %s",
+		MyLink->Name.c_str(),errormessage.c_str());
+}