X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuser_resolver.cpp;h=ecd864a698ae36ce23ef75b378772bd0a61ef08c;hb=7aab0d12db670fea68a258d9ae2b05ea5c4615be;hp=cb3db08519b3845cdcaaa324d6d92868054b965a;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index cb3db0851..ecd864a69 100644
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,105 +11,127 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDuserresolver */
-
 #include "inspircd.h"
-
-UserResolver::UserResolver(InspIRCd* Instance, User* user, std::string to_resolve, QueryType qt, bool &cache) :
-	Resolver(Instance, to_resolve, qt, cache), bound_user(user)
+UserResolver::UserResolver(LocalUser* user, std::string to_resolve, QueryType qt, bool &cache) :
+	Resolver(to_resolve, qt, cache, NULL), uuid(user->uuid)
 {
 	this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA);
-	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)
+	UserResolver *res_forward; // for forward-resolution
+	LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid);
+	if (!bound_user)
+	{
+		ServerInstance->Logs->Log("RESOLVER", DEBUG, "Resolution finished for user '%s' who is gone", uuid.c_str());
 		return;
+	}
+
+	ServerInstance->Logs->Log("RESOLVER", DEBUG, "DNS result for %s: '%s' -> '%s'", uuid.c_str(), input.c_str(), result.c_str());
 
-	if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
+	if (!fwd)
 	{
-		this->bound_user->stored_host = result;
+		// first half of resolution is done. We now need to verify that the host matches.
+		bound_user->stored_host = result;
 		try
 		{
 			/* Check we didnt time out */
-			if (this->bound_user->registered != REG_ALL)
+			if (bound_user->registered != REG_ALL)
 			{
-				bool cached;
-#ifdef IPV6
-				if (this->bound_user->GetProtocolFamily() == AF_INET6)
+				bool lcached = false;
+				if (bound_user->client_sa.sa.sa_family == AF_INET6)
 				{
-					/* IPV6 forward lookup (with possibility of 4in6) */
-					const char* ip = this->bound_user->GetIPString();
-					bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), cached);
+					/* IPV6 forward lookup */
+					res_forward = new UserResolver(bound_user, result, DNS_QUERY_AAAA, lcached);
 				}
 				else
-					/* IPV4 lookup (mixed protocol mode) */
-#endif
-				/* IPV4 lookup (ipv4 only mode) */
-				bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, cached);
-				this->ServerInstance->AddResolver(bound_user->res_forward, cached);
+				{
+					/* IPV4 lookup */
+					res_forward = new UserResolver(bound_user, result, DNS_QUERY_A, lcached);
+				}
+				ServerInstance->AddResolver(res_forward, lcached);
 			}
 		}
 		catch (CoreException& e)
 		{
-			ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
+			ServerInstance->Logs->Log("RESOLVER", DEBUG,"Error in resolver: %s",e.GetReason());
 		}
 	}
-	else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
+	else
 	{
 		/* Both lookups completed */
-		std::string result2("0::ffff:");
-		result2.append(result);
-		if (this->bound_user->GetIPString() == result || this->bound_user->GetIPString() == result2)
+
+		irc::sockets::sockaddrs* user_ip = &bound_user->client_sa;
+		bool rev_match = false;
+		if (user_ip->sa.sa_family == AF_INET6)
+		{
+			struct in6_addr res_bin;
+			if (inet_pton(AF_INET6, result.c_str(), &res_bin))
+			{
+				rev_match = !memcmp(&user_ip->in6.sin6_addr, &res_bin, sizeof(res_bin));
+			}
+		}
+		else
+		{
+			struct in_addr res_bin;
+			if (inet_pton(AF_INET, result.c_str(), &res_bin))
+			{
+				rev_match = !memcmp(&user_ip->in4.sin_addr, &res_bin, sizeof(res_bin));
+			}
+		}
+		
+		if (rev_match)
 		{
-			std::string hostname = this->bound_user->stored_host;
+			std::string hostname = bound_user->stored_host;
 			if (hostname.length() < 65)
 			{
 				/* Check we didnt time out */
-				if ((this->bound_user->registered != REG_ALL) && (!this->bound_user->dns_done))
+				if ((bound_user->registered != REG_ALL) && (!bound_user->dns_done))
 				{
 					/* Hostnames starting with : are not a good thing (tm) */
-					if (*(hostname.c_str()) == ':')
+					if (hostname[0] == ':')
 						hostname.insert(0, "0");
 
-					this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : ""));
-					this->bound_user->dns_done = true;
-					strlcpy(this->bound_user->dhost, hostname.c_str(),64);
-					strlcpy(this->bound_user->host, hostname.c_str(),64);
+					bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : ""));
+					bound_user->dns_done = true;
+					bound_user->dhost.assign(hostname, 0, 64);
+					bound_user->host.assign(hostname, 0, 64);
 					/* Invalidate cache */
-					this->bound_user->InvalidateCache();
+					bound_user->InvalidateCache();
 				}
 			}
 			else
 			{
-				if (!this->bound_user->dns_done)
+				if (!bound_user->dns_done)
 				{
-					this->bound_user->WriteServ("NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", this->bound_user->GetIPString());
-					this->bound_user->dns_done = true;
+					bound_user->WriteServ("NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", bound_user->GetIPString());
+					bound_user->dns_done = true;
 				}
 			}
 		}
 		else
 		{
-			if (!this->bound_user->dns_done)
+			if (!bound_user->dns_done)
 			{
-				this->bound_user->WriteServ("NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", this->bound_user->GetIPString());
-				this->bound_user->dns_done = true;
+				bound_user->WriteServ("NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", bound_user->GetIPString());
+				bound_user->dns_done = true;
 			}
 		}
+
+		// Save some memory by freeing this up; it's never used again in the user's lifetime.
+		bound_user->stored_host.resize(0);
 	}
 }
 
 void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 {
-	if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
+	LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid);
+	if (bound_user)
 	{
-		this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname: %s; using your IP address (%s) instead.", errormessage.c_str(), this->bound_user->GetIPString());
-		this->bound_user->dns_done = true;
+		bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname: %s; using your IP address (%s) instead.", errormessage.c_str(), bound_user->GetIPString());
+		bound_user->dns_done = true;
+		bound_user->stored_host.resize(0);
 		ServerInstance->stats->statsDnsBad++;
 	}
 }
-
-