X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fresolvers.cpp;h=2811737b80053fc59907daadfb3978ef5089d8a3;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=80e8aeb0e23db5d373486ac2d2db64ae7bdd6eb8;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index 80e8aeb0e..2811737b8 100644
--- 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-2020 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
@@ -29,7 +35,7 @@
 #include "treesocket.h"
 
 /** This class is used to resolve server hostnames during /connect and autoconnect.
- * As of 1.1, the resolver system is seperated out from BufferedSocket, so we must do this
+ * As of 1.1, the resolver system is separated out from BufferedSocket, so we must do this
  * resolver step first ourselves if we need it. This is totally nonblocking, and will
  * 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.
@@ -42,21 +48,30 @@ ServernameResolver::ServernameResolver(DNS::Manager* mgr, const std::string& hos
 
 void ServernameResolver::OnLookupComplete(const DNS::Query *r)
 {
-	const DNS::ResourceRecord &ans_record = r->answers[0];
+	const DNS::ResourceRecord* const ans_record = r->FindAnswerOfType(this->question.type);
+	if (!ans_record)
+	{
+		OnError(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);
-		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.",
@@ -68,7 +83,12 @@ void ServernameResolver::OnLookupComplete(const DNS::Query *r)
 
 void ServernameResolver::OnError(const DNS::Query *r)
 {
-	/* Ooops! */
+	if (r->error == DNS::ERROR_UNLOADED)
+	{
+		// We're being unloaded, skip the snotice and ConnectServer() below to prevent autoconnect creating new sockets
+		return;
+	}
+
 	if (query == DNS::QUERY_AAAA)
 	{
 		ServernameResolver* snr = new ServernameResolver(this->manager, host, MyLink, DNS::QUERY_A, myautoconnect);
@@ -95,14 +115,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;
 		}
 	}
@@ -110,6 +133,7 @@ void SecurityIPResolver::OnLookupComplete(const DNS::Query *r)
 
 void SecurityIPResolver::OnError(const DNS::Query *r)
 {
+	// This can be called because of us being unloaded but we don't have to do anything differently
 	if (query == DNS::QUERY_AAAA)
 	{
 		SecurityIPResolver* res = new SecurityIPResolver(mine, this->manager, host, MyLink, DNS::QUERY_A);
@@ -128,7 +152,7 @@ void SecurityIPResolver::OnError(const DNS::Query *r)
 }
 
 CacheRefreshTimer::CacheRefreshTimer()
-	: Timer(3600, ServerInstance->Time(), true)
+	: Timer(3600, true)
 {
 }