Roll back mysterious DNS change from 2007 which broke multiple-answer

DNS requests (CNAME, A). It looks like this was to be related to bitmask
dnsbl support, but it would never have worked anyway (resultnum was always 0..).

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11419 e03df62e-2008-0410-955e-edbf42e46eb7

8 files changed, 20 insertions, 41 deletions

diff --git a/include/dns.h b/include/dns.h
index e9c5fe924..4f577366b 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -284,10 +284,8 @@ class CoreExport Resolver : public Extensible
 	 * result, this is the number of seconds remaining before refresh/expiry.
 	 * @param cached True if the result is a cached result, false if it was requested
 	 * from the DNS server.
-	 * @param resultnum Result number, for records with multiple matching results.
-	 * Normally, you will only want to act on this when the result is 0.
 	 */
-	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0) = 0;
+	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) = 0;
 
 	/**
 	 * If an error occurs (such as NXDOMAIN, no domain name found) then this method
@@ -450,9 +448,8 @@ class CoreExport DNS : public EventHandler
 	/**
 	 * Fetch the result string (an ip or host)
 	 * and/or an error message to go with it.
-	 * @param resultnum Result number to fetch
 	 */
-	DNSResult GetResult(int resultnum);
+	DNSResult GetResult();
 
 	/**
 	 * Handle a SocketEngine read event
diff --git a/include/users.h b/include/users.h
index 7887d545d..9d1072f57 100644
--- a/include/users.h
+++ b/include/users.h
@@ -1139,9 +1139,8 @@ class CoreExport UserResolver : public Resolver
 	 * @param result Result string
 	 * @param ttl Time to live for result
 	 * @param cached True if the result was found in the cache
-	 * @param resultnum Result number, we are only interested in result 0
 	 */
-	void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0);
+	void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached);
 
 	/** Called on failed lookup
 	 * @param e Error code
diff --git a/src/dns.cpp b/src/dns.cpp
index 50fdee34b..ed2eff2bb 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -101,7 +101,7 @@ class DNSRequest
 
 	DNSRequest(InspIRCd* Instance, DNS* dns, int id, const std::string &original);
 	~DNSRequest();
-	DNSInfo ResultIsReady(DNSHeader &h, int length, int result_we_want);
+	DNSInfo ResultIsReady(DNSHeader &h, int length);
 	int SendRequests(const DNSHeader *header, const int length, QueryType qt);
 };
 
@@ -610,7 +610,7 @@ void DNS::MakeIP6Int(char* query, const in6_addr *ip)
 }
 
 /** Return the next id which is ready, and the result attached to it */
-DNSResult DNS::GetResult(int resultnum)
+DNSResult DNS::GetResult()
 {
 	/* Fetch dns query response and decide where it belongs */
 	DNSHeader header;
@@ -697,7 +697,7 @@ DNSResult DNS::GetResult(int resultnum)
 	 * When its finished it will return a DNSInfo which is a pair of
 	 * unsigned char* resource record data, and an error message.
 	 */
-	DNSInfo data = req->ResultIsReady(header, length, resultnum);
+	DNSInfo data = req->ResultIsReady(header, length);
 	std::string resultstr;
 
 	/* Check if we got a result, if we didnt, its an error */
@@ -773,7 +773,7 @@ DNSResult DNS::GetResult(int resultnum)
 }
 
 /** A result is ready, process it */
-DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_want)
+DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length)
 {
 	int i = 0;
 	int q = 0;
@@ -844,10 +844,10 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w
 			return std::make_pair((unsigned char*)NULL,"Incorrectly sized DNS reply");
 
 		/* XXX: We actually initialise 'rr' here including its ttl field */
-		if (curanswer == result_we_want)
-			DNS::FillResourceRecord(&rr,&header.payload[i]);
+		DNS::FillResourceRecord(&rr,&header.payload[i]);
 
 		i += 10;
+		ServerInstance->Logs->Log("RESOLVER",DEBUG,"Resolver: rr.type is %d and this.type is %d rr.class %d this.class %d", rr.type, this->type, rr.rr_class, this->rr_class);
 		if (rr.type != this->type)
 		{
 			curanswer++;
@@ -863,7 +863,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w
 		break;
 	}
 	if ((unsigned int)curanswer == header.ancount)
-		return std::make_pair((unsigned char*)NULL,"No more answers (" + ConvToStr(header.ancount) + " answers, wanted #" + ConvToStr(result_we_want) + ")");
+		return std::make_pair((unsigned char*)NULL,"No A, AAAA or PTR type answers (" + ConvToStr(header.ancount) + " answers)");
 
 	if (i + rr.rdlength > (unsigned int)length)
 		return std::make_pair((unsigned char*)NULL,"Resource record larger than stated");
@@ -947,7 +947,7 @@ void DNS::DelCache(const std::string &source)
 void Resolver::TriggerCachedResult()
 {
 	if (CQ)
-		OnLookupComplete(CQ->data, time_left, true, 0);
+		OnLookupComplete(CQ->data, time_left, true);
 }
 
 /** High level abstraction of dns used by application at large */
@@ -1055,14 +1055,13 @@ Module* Resolver::GetCreator()
 void DNS::HandleEvent(EventType, int)
 {
 	/* Fetch the id and result of the next available packet */
-	int resultnum = 0;
 	DNSResult res(0,"",0,"");
 	res.id = 0;
 	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Handle DNS event");
 
-	res = this->GetResult(resultnum);
+	res = this->GetResult();
 
-	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result %d id %d", resultnum, res.id);
+	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result id %d", res.id);
 
 	/* Is there a usable request id? */
 	if (res.id != -1)
@@ -1094,7 +1093,7 @@ void DNS::HandleEvent(EventType, int)
 				if (!this->GetCache(res.original.c_str()))
 					this->cache->insert(std::make_pair(res.original.c_str(), CachedQuery(res.result, res.ttl)));
 
-				Classes[res.id]->OnLookupComplete(res.result, res.ttl, false, resultnum);
+				Classes[res.id]->OnLookupComplete(res.result, res.ttl, false);
 				delete Classes[res.id];
 				Classes[res.id] = NULL;
 			}
@@ -1103,8 +1102,6 @@ void DNS::HandleEvent(EventType, int)
 		if (ServerInstance && ServerInstance->stats)
 			ServerInstance->stats->statsDns++;
 	}
-
-	resultnum++;
 }
 
 /** Add a derived Resolver to the working set */
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index bfd5b5290..39680d8b9 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -101,11 +101,8 @@ class CGIResolver : public Resolver
 	CGIResolver(Module* me, InspIRCd* Instance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
 		: Resolver(Instance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
-	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
+	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 	{
-		if (resultnum)
-			return;
-
 		/* Check the user still exists */
 		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
 		{
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 2ee71ce87..7fb652cf7 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -60,12 +60,8 @@ class DNSBLResolver : public Resolver
 	}
 
 	/* Note: This may be called multiple times for multiple A record results */
-	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
+	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 	{
-		/* for bitmask reply types, we arent interested in any but the first result (number 0) */
-		if ((ConfEntry->type == DNSBLConfEntry::A_BITMASK) && (resultnum))
-			return;
-
 		/* Check the user still exists */
 		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
 		{
diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index 4ec3e5dc7..b4b476909 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -38,11 +38,8 @@ ServernameResolver::ServernameResolver(Module* me, SpanningTreeUtilities* Util,
 	/* Nothing in here, folks */
 }
 
-void ServernameResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum)
+void ServernameResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 {
-	if (resultnum)
-		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.
diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index 8ce55921b..046d4aa54 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -40,7 +40,7 @@ class SecurityIPResolver : public Resolver
 	{
 	}
 
-	void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
+	void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 	{
 		Utils->ValidIPs.push_back(result);
 	}
@@ -78,7 +78,7 @@ class ServernameResolver : public Resolver
 	Module* mine;
  public:
         ServernameResolver(Module* me, SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &hostname, Link x, bool &cached, QueryType qt);
-        void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0);
+        void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached);
         void OnError(ResolverError e, const std::string &errormessage);
 };
 
diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index 0218f3269..0213a3cbf 100644
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -21,12 +21,8 @@ UserResolver::UserResolver(InspIRCd* Instance, User* user, std::string to_resolv
 	this->bound_fd = user->GetFd();
 }
 
-void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum)
+void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 {
-	/* We are only interested in the first matching result */
-	if (resultnum)
-		return;
-
 	UserResolver *res_forward; // for forward-resolution
 
 	if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))