X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuser_resolver.cpp;h=bd27d63503871d6d47b6c05af170d1ea2aa84246;hb=4efdfce66a255dd5ce2e2a940842ebfe9b02c651;hp=8dec4c5419f38c7ae365112c3c8c9f2ac700c3f4;hpb=12427e75fe175fe7a62f388281dd7ab5100c9dda;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index 8dec4c541..bd27d6350 100644
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDuserresolver */
+/* $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)
 {
@@ -28,6 +27,8 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 	if (resultnum)
 		return;
 
+	UserResolver *res_forward; // for forward-resolution
+
 	if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
 	{
 		this->bound_user->stored_host = result;
@@ -36,20 +37,22 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 			/* Check we didnt time out */
 			if (this->bound_user->registered != REG_ALL)
 			{
-				bool lcached;
+				bool lcached = false;
 #ifdef IPV6
 				if (this->bound_user->GetProtocolFamily() == 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), lcached);
+					res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : 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, lcached);
-				this->ServerInstance->AddResolver(bound_user->res_forward, lcached);
+				{
+					/* IPV4 lookup (ipv4 only mode) */
+					res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached);
+				}
+				this->ServerInstance->AddResolver(res_forward, lcached);
 			}
 		}
 		catch (CoreException& e)
@@ -99,6 +102,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);
 	}
 }
 
@@ -108,8 +114,7 @@ void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 	{
 		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++;
 	}
 }
-
-