X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_antibear.cpp;h=a89e9dd4d2901b0e053139c8f52cf8bd303fd9c2;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=515030f242c95dee451104afe977a5fcf0ca08b1;hpb=ef2c666eef23793fb400a31e45196f1d08169043;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 515030f24..a89e9dd4d 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.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,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 #include "xline.h"
 
@@ -21,79 +18,58 @@
 
 class ModuleAntiBear : public Module
 {
- private:
-
+	LocalIntExt bearExt;
  public:
-	ModuleAntiBear(InspIRCd* Me) : Module::Module(Me)
+	ModuleAntiBear() : bearExt("antibear_timewait", this)
 	{
-		
+		Extensible::Register(&bearExt);
+		Implementation eventlist[] = { I_OnUserRegister, I_OnPreCommand };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
-	
+
 	virtual ~ModuleAntiBear()
 	{
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
-	}
 
-	void Implements(char* List)
+	virtual Version GetVersion()
 	{
-		List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
+		return Version("Sends a numeric on connect which cripples a common type of trojan/spambot",VF_VENDOR,API_VERSION);
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
 	{
-		if (command == "NOTICE" && !validated && pcnt > 1)
+		if (command == "NOTICE" && !validated && parameters.size() > 1 && bearExt.get(user))
 		{
-			if (!strcmp(parameters[1], "\1TIME Mon May 01 18:54:20 2006\1"))
+			if (!strncmp(parameters[1].c_str(), "\1TIME Mon May 01 18:54:20 2006", 30))
 			{
-				if (ServerInstance->XLines->add_zline(86400, ServerInstance->Config->ServerName, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->MakeHostIP()))
+				ZLine* zl = new ZLine(ServerInstance->Time(), 86400, ServerInstance->Config->ServerName,
+						"Unless you're stuck in a time warp, you appear to be a bear bot!", user->GetIPString());
+				if (ServerInstance->XLines->AddLine(zl,NULL))
 				{
-					ServerInstance->XLines->apply_lines(APPLY_ZLINES);
-					FOREACH_MOD(I_OnAddGLine,OnAddZLine(86400, NULL, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->MakeHostIP()));
-					return 1;
+					ServerInstance->XLines->ApplyLines();
 				}
+				else
+					delete zl;
+
+				return MOD_RES_DENY;
 			}
+
+			bearExt.set(user, 0);
+			// Block the command, so the user doesn't receive a no such nick notice
+			return MOD_RES_DENY;
 		}
-		return 0;
-	}
 
-	virtual int OnUserRegister(userrec* user)
-	{
-		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);
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
-};
 
-class ModuleAntiBearFactory : public ModuleFactory
-{
- public:
-	ModuleAntiBearFactory()
-	{
-	}
-	
-	~ModuleAntiBearFactory()
+	virtual ModResult OnUserRegister(User* user)
 	{
+		user->WriteNumeric(439, "%s :This server has anti-spambot mechanisms enabled.", user->nick.c_str());
+		user->WriteNumeric(931, "%s :Malicious bots, spammers, and other automated systems of dubious origin are NOT welcome here.", user->nick.c_str());
+		user->WriteServ("PRIVMSG %s :\1TIME\1", user->nick.c_str());
+		bearExt.set(user, 1);
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleAntiBear(Me);
-	}
-	
 };
 
-
-//
-// The "C" linkage factory0() function creates the ModuleAntiBearFactory
-// class for this library
-//
-
-extern "C" void * init_module( void )
-{
-	return new ModuleAntiBearFactory;
-}
+MODULE_INIT(ModuleAntiBear)