X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_hostname_lookup.cpp;h=b9adc9c2e7433df71b9629a18880ba5fa3feb6fa;hb=5ac5440a44595a7d7073a311bc280274aaed449e;hp=3d3e9703ae2c6e5ab4a5cfa818de582e3d549980;hpb=f2db4b743f0df9b9e588979fd0fcf2815e54af44;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp
index 3d3e9703a..b9adc9c2e 100644
--- a/src/coremods/core_hostname_lookup.cpp
+++ b/src/coremods/core_hostname_lookup.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2013-2016 Adam <Adam@anope.org>
  *
  * 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
@@ -61,29 +61,34 @@ class UserResolver : public DNS::Request
 		LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid);
 		if (!bound_user)
 		{
-			ServerInstance->Logs->Log("RESOLVER", LOG_DEBUG, "Resolution finished for user '%s' who is gone", uuid.c_str());
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Resolution finished for user '%s' who is gone", uuid.c_str());
 			return;
 		}
 
-		const DNS::ResourceRecord& ans_record = r->answers[0];
+		const DNS::ResourceRecord* ans_record = r->FindAnswerOfType(this->question.type);
+		if (ans_record == NULL)
+		{
+			OnError(r);
+			return;
+		}
 
-		ServerInstance->Logs->Log("RESOLVER", LOG_DEBUG, "DNS result for %s: '%s' -> '%s'", uuid.c_str(), ans_record.name.c_str(), ans_record.rdata.c_str());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "DNS result for %s: '%s' -> '%s'", uuid.c_str(), ans_record->name.c_str(), ans_record->rdata.c_str());
 
 		if (!fwd)
 		{
 			// first half of resolution is done. We now need to verify that the host matches.
-			ph->set(bound_user, ans_record.rdata);
+			ph->set(bound_user, ans_record->rdata);
 
 			UserResolver* res_forward;
 			if (bound_user->client_sa.sa.sa_family == AF_INET6)
 			{
 				/* IPV6 forward lookup */
-				res_forward = new UserResolver(this->manager, this->creator, bound_user, ans_record.rdata, DNS::QUERY_AAAA);
+				res_forward = new UserResolver(this->manager, this->creator, bound_user, ans_record->rdata, DNS::QUERY_AAAA);
 			}
 			else
 			{
 				/* IPV4 lookup */
-				res_forward = new UserResolver(this->manager, this->creator, bound_user, ans_record.rdata, DNS::QUERY_A);
+				res_forward = new UserResolver(this->manager, this->creator, bound_user, ans_record->rdata, DNS::QUERY_A);
 			}
 			try
 			{
@@ -107,7 +112,7 @@ class UserResolver : public DNS::Request
 			if (user_ip->sa.sa_family == AF_INET6)
 			{
 				struct in6_addr res_bin;
-				if (inet_pton(AF_INET6, ans_record.rdata.c_str(), &res_bin))
+				if (inet_pton(AF_INET6, ans_record->rdata.c_str(), &res_bin))
 				{
 					rev_match = !memcmp(&user_ip->in6.sin6_addr, &res_bin, sizeof(res_bin));
 				}
@@ -115,7 +120,7 @@ class UserResolver : public DNS::Request
 			else
 			{
 				struct in_addr res_bin;
-				if (inet_pton(AF_INET, ans_record.rdata.c_str(), &res_bin))
+				if (inet_pton(AF_INET, ans_record->rdata.c_str(), &res_bin))
 				{
 					rev_match = !memcmp(&user_ip->in4.sin_addr, &res_bin, sizeof(res_bin));
 				}
@@ -129,7 +134,7 @@ class UserResolver : public DNS::Request
 
 				if (hostname == NULL)
 				{
-					ServerInstance->Logs->Log("RESOLVER", LOG_DEFAULT, "ERROR: User has no hostname attached when doing a forward lookup");
+					ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: User has no hostname attached when doing a forward lookup");
 					bound_user->WriteNotice("*** There was an internal error resolving your host, using your IP address (" + bound_user->GetIPString() + ") instead.");
 					return;
 				}
@@ -170,7 +175,6 @@ class UserResolver : public DNS::Request
 		{
 			bound_user->WriteNotice("*** Could not resolve your hostname: " + this->manager->GetErrorStr(query->error) + "; using your IP address (" + bound_user->GetIPString() + ") instead.");
 			dl->set(bound_user, 0);
-			ServerInstance->stats->statsDnsBad++;
 		}
 	}
 };
@@ -183,8 +187,8 @@ class ModuleHostnameLookup : public Module
 
  public:
 	ModuleHostnameLookup()
-		: dnsLookup("dnsLookup", this)
-		, ptrHosts("ptrHosts", this)
+		: dnsLookup("dnsLookup", ExtensionItem::EXT_USER, this)
+		, ptrHosts("ptrHosts", ExtensionItem::EXT_USER, this)
 		, DNS(this, "DNS")
 	{
 		dl = &dnsLookup;
@@ -215,7 +219,6 @@ class ModuleHostnameLookup : public Module
 			this->dnsLookup.set(user, 0);
 			delete res_reverse;
 			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Error in resolver: " + e.GetReason());
-			ServerInstance->stats->statsDnsBad++;
 		}
 	}