X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuser_resolver.cpp;h=b37d112feef60824326a8c6fb31070836a218ec4;hb=58895f9b1daa1e13927462d046a36dec853a40e0;hp=adae765ebe2f164302126491882992437d5ee225;hpb=2116de82e08d08a661fd3203183132410cc19d0b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index adae765eb..b37d112fe 100644
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,8 +11,9 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd.h"
+/* $Core */
 
+#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)
 {
@@ -20,11 +21,9 @@ 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))
 	{
@@ -34,33 +33,49 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 			/* Check we didnt time out */
 			if (this->bound_user->registered != REG_ALL)
 			{
-				bool cached;
-#ifdef IPV6
-				if (this->bound_user->GetProtocolFamily() == AF_INET6)
+				bool lcached = false;
+				if (this->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(this->ServerInstance, this->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(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached);
+				}
+				this->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))
 	{
 		/* 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 = &this->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;
 			if (hostname.length() < 65)
@@ -69,13 +84,13 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 				if ((this->bound_user->registered != REG_ALL) && (!this->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);
+					this->bound_user->dhost.assign(hostname, 0, 64);
+					this->bound_user->host.assign(hostname, 0, 64);
 					/* Invalidate cache */
 					this->bound_user->InvalidateCache();
 				}
@@ -97,6 +112,9 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 				this->bound_user->dns_done = true;
 			}
 		}
+
+		// Save some memory by freeing this up; it's never used again in the user's lifetime.
+		this->bound_user->stored_host.resize(0);
 	}
 }
 
@@ -104,15 +122,9 @@ void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 {
 	if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
 	{
-		/* Since dns timeout is implemented outside of the resolver, this was a race condition that could result in this message being sent *after*
-		 * the user was fully connected. This check fixes that issue  - Special */
-		if (!this->bound_user->dns_done)
-		{
-			/* Error message here */
-			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;
-		}
+		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;
+		this->bound_user->stored_host.resize(0);
+		ServerInstance->stats->statsDnsBad++;
 	}
 }
-
-