Cached GetFullRealHost etc.

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

3 files changed, 74 insertions, 9 deletions

diff --git a/include/users.h b/include/users.h
index d24a93fca..719af2271 100644
--- a/include/users.h
+++ b/include/users.h
@@ -226,6 +226,11 @@ class userrec : public connection
 	/** Number of channels this user is currently on
 	 */
 	unsigned int ChannelCount;
+
+	char* cached_fullhost;
+	char* cached_hostip;
+	char* cached_makehost;
+	char* cached_fullrealhost;
  public:
 	/** Resolvers for looking up this users IP address
 	 * This will occur if and when res_reverse completes.
@@ -429,6 +434,11 @@ class userrec : public connection
 	 */
 	virtual char* GetFullRealHost();
 
+	/** This clears any cached results that are used for GetFullRealHost() etc.
+	 * The results of these calls are cached as generating them can be generally expensive.
+	 */
+	void InvalidateCache();
+
 	/** Create a displayable mode string for this users snomasks
 	 * @return The notice mask character sequence
 	 */
diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 7801a200f..839125faa 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -108,6 +108,9 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
 	/* change the nick of the user in the users_hash */
 	user = user->UpdateNickHash(parameters[0]);
+
+	user->InvalidateCache();
+
 	/* actually change the nick within the record */
 	if (!user) return CMD_FAILURE;
 	if (!*user->nick) return CMD_FAILURE;
diff --git a/src/users.cpp b/src/users.cpp
index 070b8f9cc..b4d7f15dc 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -212,6 +212,8 @@ void UserResolver::OnLookupComplete(const std::string &result)
 					this->bound_user->dns_done = true;
 					strlcpy(this->bound_user->dhost, hostname.c_str(),64);
 					strlcpy(this->bound_user->host, hostname.c_str(),64);
+					/* Invalidate cache */
+					this->bound_user->InvalidateCache();
 				}
 			}
 			else
@@ -231,7 +233,7 @@ void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 	if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
 	{
 		/* Error message here */
-		this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname, using your IP address (%s) instead.", this->bound_user->GetIPString());
+		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;
 	}
 }
@@ -308,10 +310,14 @@ userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
 	invites.clear();
 	memset(modes,0,sizeof(modes));
 	memset(snomasks,0,sizeof(snomasks));
+	/* Invalidate cache */
+	cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
 }
 
 userrec::~userrec()
 {
+	this->InvalidateCache();
+
 	if (ip)
 	{
 		clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString());
@@ -349,7 +355,10 @@ userrec::~userrec()
 
 char* userrec::MakeHost()
 {
-	static char nhost[MAXBUF];
+	if (this->cached_makehost)
+		return this->cached_makehost;
+
+	char nhost[MAXBUF];
 	/* This is much faster than snprintf */
 	char* t = nhost;
 	for(char* n = ident; *n; n++)
@@ -358,12 +367,18 @@ char* userrec::MakeHost()
 	for(char* n = host; *n; n++)
 		*t++ = *n;
 	*t = 0;
-	return nhost;
+
+	this->cached_makehost = strdup(nhost);
+
+	return this->cached_makehost;
 }
 
 char* userrec::MakeHostIP()
 {
-	static char ihost[MAXBUF];
+	if (this->cached_hostip)
+		return this->cached_hostip;
+
+	char ihost[MAXBUF];
 	/* This is much faster than snprintf */
 	char* t = ihost;
 	for(char* n = ident; *n; n++)
@@ -372,7 +387,10 @@ char* userrec::MakeHostIP()
 	for(const char* n = this->GetIPString(); *n; n++)
 		*t++ = *n;
 	*t = 0;
-	return ihost;
+
+	this->cached_hostip = strdup(ihost);
+
+	return this->cached_hostip;
 }
 
 void userrec::CloseSocket()
@@ -383,7 +401,10 @@ void userrec::CloseSocket()
  
 char* userrec::GetFullHost()
 {
-	static char result[MAXBUF];
+	if (this->cached_fullhost)
+		return this->cached_fullhost;
+
+	char result[MAXBUF];
 	char* t = result;
 	for(char* n = nick; *n; n++)
 		*t++ = *n;
@@ -394,7 +415,10 @@ char* userrec::GetFullHost()
 	for(char* n = dhost; *n; n++)
 		*t++ = *n;
 	*t = 0;
-	return result;
+
+	this->cached_fullhost = strdup(result);
+
+	return this->cached_fullhost;
 }
 
 char* userrec::MakeWildHost()
@@ -422,7 +446,10 @@ int userrec::ReadData(void* buffer, size_t size)
 
 char* userrec::GetFullRealHost()
 {
-	static char fresult[MAXBUF];
+	if (this->cached_fullrealhost)
+		return this->cached_fullrealhost;
+
+	char fresult[MAXBUF];
 	char* t = fresult;
 	for(char* n = nick; *n; n++)
 		*t++ = *n;
@@ -433,7 +460,10 @@ char* userrec::GetFullRealHost()
 	for(char* n = host; *n; n++)
 		*t++ = *n;
 	*t = 0;
-	return fresult;
+
+	this->cached_fullrealhost = strdup(fresult);
+
+	return this->cached_fullrealhost;
 }
 
 bool userrec::IsInvited(const irc::string &channel)
@@ -1230,11 +1260,27 @@ userrec* userrec::UpdateNickHash(const char* New)
 	}
 }
 
+void userrec::InvalidateCache()
+{
+	/* Invalidate cache */
+	if (cached_fullhost)
+		free(cached_fullhost);
+	if (cached_hostip)
+		free(cached_hostip);
+	if (cached_makehost)
+		free(cached_makehost);
+	if (cached_fullrealhost)
+		free(cached_fullrealhost);
+	cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+}
+
 bool userrec::ForceNickChange(const char* newnick)
 {
 	try
 	{
 		int MOD_RESULT = 0;
+
+		this->InvalidateCache();
 	
 		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
 
@@ -1791,6 +1837,9 @@ bool userrec::ChangeDisplayedHost(const char* host)
 	if (!strcmp(host, this->dhost))
 		return true;
 
+	/* Invalidate cache */
+	this->InvalidateCache();
+
 	if (IS_LOCAL(this))
 	{
 		int MOD_RESULT = 0;
@@ -1827,6 +1876,9 @@ bool userrec::ChangeIdent(const char* newident)
 	if (!strcmp(newident, this->ident))
 		return true;
 
+	/* Invalidate cache */
+	this->InvalidateCache();
+
 	if (this->ServerInstance->Config->CycleHosts)
 		this->WriteCommonExcept("%s","QUIT :Changing ident");