Fixed the handling of the CTCP TIME reply in m_antibear - it could generate random client errors. Bug #341

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

1 files changed, 13 insertions, 8 deletions

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 7ba97eb70..6b40407a5 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -40,12 +40,12 @@ class ModuleAntiBear : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
+		List[I_OnUserRegister] = List[I_OnPreCommand] = List[I_OnUserConnect] = 1;
 	}
 
 	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
 	{
-		if (command == "NOTICE" && !validated && pcnt > 1)
+		if (command == "NOTICE" && !validated && pcnt > 1 && user->GetExt("antibear_timewait"))
 		{
 			if (!strncmp(parameters[1], "\1TIME Mon May 01 18:54:20 2006", 30))
 			{
@@ -56,13 +56,12 @@ class ModuleAntiBear : public Module
 					return 1;
 				}
 			}
-			else
-			{
-				/* Theyre not registered and the notice is targetted at a server. */
-				if ((user->registered != REG_ALL) && (strchr(parameters[0], '.')))
-					return 1;
-			}
+			
+			user->Shrink("antibear_timewait");
+			// Block the command, so the user doesn't receive a no such nick notice
+			return 1;
 		}
+		
 		return 0;
 	}
 
@@ -71,8 +70,14 @@ class ModuleAntiBear : public Module
 		user->WriteServ("439 %s :This server has anti-spambot mechanisms enabled.", user->nick);
 		user->WriteServ("931 %s :Malicious bots, spammers, and other automated systems of dubious origin are NOT welcome here.", user->nick);
 		user->WriteServ("PRIVMSG %s :\1TIME\1", user->nick);
+		user->Extend("antibear_timewait");
 		return 0;
 	}
+	
+	virtual void OnUserConnect(userrec *user)
+	{
+		user->Shrink("antibear_timewait");
+	}
 };
 
 MODULE_INIT(ModuleAntiBear)