X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dccallow.cpp;h=572188b7c0065db75104ea7e2262ec659e656756;hb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;hp=e662995ae27b25079c9ca97a7f23b16349565cd2;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index e662995ae..572188b7c 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,12 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <vector>
-#include <string.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Povides support for the /DCCALLOW command */
@@ -43,23 +37,24 @@ class DCCAllow
 	DCCAllow(const std::string &nick, const std::string &hm, const time_t so, const long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
 };
 
-typedef std::vector<userrec *> userlist;
+typedef std::vector<User *> userlist;
 userlist ul;
 typedef std::vector<DCCAllow> dccallowlist;
 dccallowlist* dl;
 typedef std::vector<BannedFileList> bannedfilelist;
 bannedfilelist bfl;
 
-class cmd_dccallow : public command_t
+class CommandDccallow : public Command
 {
  public:
-	cmd_dccallow(InspIRCd* Me) : command_t(Me, "DCCALLOW", 0, 0)
+	CommandDccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0)
 	{
 		this->source = "m_dccallow.so";
 		syntax = "{[+|-]<nick> <time>|HELP|LIST}";
+		/* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
 	}
 
-	CmdResult Handle(const char **parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user)
 	{
 		/* syntax: DCCALLOW [+|-]<nick> (<time>) */
 		if (!pcnt)
@@ -90,41 +85,36 @@ class cmd_dccallow : public command_t
 			}
 			
 			std::string nick = parameters[0] + 1;
-			userrec *target = ServerInstance->FindNick(nick);
+			User *target = ServerInstance->FindNick(nick);
 	
 			if (target)
 			{
-				ServerInstance->Log(DEBUG, "m_dccallow.so: got target %s and action %c", target->nick, action);
 				
 				if (action == '-')
 				{
-					user->GetExt("dccallow_list", dl);
 					// check if it contains any entries
-					if (dl)
+					if (user->GetExt("dccallow_list", dl))
 					{
-						if (dl->size())
+						for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
 						{
-							for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
+							// search through list
+							if (i->nickname == target->nick)
 							{
-								// search through list
-								if (i->nickname == target->nick)
-								{
-									dl->erase(i);
-									user->WriteServ("995 %s %s :Removed %s from your DCCALLOW list", user->nick, user->nick, target->nick);
-									break;
-								}
+								dl->erase(i);
+								user->WriteServ("995 %s %s :Removed %s from your DCCALLOW list", user->nick, user->nick, target->nick);
+								break;
 							}
 						}
 					}
 					else
 					{
-						DELETE(dl);
+						delete  dl;
 						user->Shrink("dccallow_list");
 				
 						// remove from userlist
 						for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
 						{
-							userrec* u = (userrec*)(*j);
+							User* u = (User*)(*j);
 							if (u == user)
 							{
 								ul.erase(j);
@@ -135,10 +125,7 @@ class cmd_dccallow : public command_t
 				}
 				else if (action == '+')
 				{
-					// fetch current DCCALLOW list
-					user->GetExt("dccallow_list", dl);
-					// they don't have one, create it
-					if (!dl)
+					if (!user->GetExt("dccallow_list", dl))
 					{
 						dl = new dccallowlist;
 						user->Extend("dccallow_list", dl);
@@ -165,7 +152,7 @@ class cmd_dccallow : public command_t
 					long length;
 					if (pcnt < 2)
 					{
-						length = ServerInstance->Duration(default_length.c_str());
+						length = ServerInstance->Duration(default_length);
 					} 
 					else if (!atoi(parameters[1]))
 					{
@@ -191,7 +178,8 @@ class cmd_dccallow : public command_t
 					{
 						user->WriteServ("994 %s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
 					}
-				
+
+					/* route it. */
 					return CMD_SUCCESS;
 				}
 			}
@@ -205,7 +193,7 @@ class cmd_dccallow : public command_t
 		return CMD_FAILURE;
 	}
 
-	void DisplayHelp(userrec* user)
+	void DisplayHelp(User* user)
 	{
 		user->WriteServ("998 %s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick);
 		user->WriteServ("998 %s :You may allow DCCs from specific users by specifying a", user->nick);
@@ -229,13 +217,12 @@ class cmd_dccallow : public command_t
 		user->WriteServ("999 %s :End of DCCALLOW HELP", user->nick);
 	}
 	
-	void DisplayDCCAllowList(userrec* user)
+	void DisplayDCCAllowList(User* user)
 	{
 		 // display current DCCALLOW list
 		user->WriteServ("990 %s :Users on your DCCALLOW list:", user->nick);
-		user->GetExt("dccallow_list", dl);
-		
-		if (dl)
+	
+		if (user->GetExt("dccallow_list", dl))
 		{
 			for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
 			{
@@ -250,38 +237,35 @@ class cmd_dccallow : public command_t
 	
 class ModuleDCCAllow : public Module
 {
-	cmd_dccallow* mycommand;
+	CommandDccallow* mycommand;
  public:
 
 	ModuleDCCAllow(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		Conf = new ConfigReader(ServerInstance);
-		mycommand = new cmd_dccallow(ServerInstance);
+		mycommand = new CommandDccallow(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		ReadFileConf();
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPreNick, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
-	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason)
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
-		dccallowlist* dl;
+		dccallowlist* udl;
 	
 		// remove their DCCALLOW list if they have one
-		user->GetExt("dccallow_list", dl);
-		if (dl)
+		if (user->GetExt("dccallow_list", udl))
 		{
-			DELETE(dl);
+			delete udl;
 			user->Shrink("dccallow_list");
 			RemoveFromUserlist(user);
 		}
@@ -292,24 +276,25 @@ class ModuleDCCAllow : public Module
 	}
 
 
-	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+	virtual int OnUserPreNick(User* user, const std::string &newnick)
 	{
 		RemoveNick(user);
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
 	}
 
-	virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		Expire();
-	
+		if (!IS_LOCAL(user))
+			return 0;
+
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)dest;
+			User* u = (User*)dest;
 
 			/* Always allow a user to dcc themselves (although... why?) */
 			if (user == u)
@@ -317,37 +302,29 @@ class ModuleDCCAllow : public Module
 		
 			if ((text.length()) && (text[0] == '\1'))
 			{
+				Expire();
+
 				// :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :DCC SEND m_dnsbl.cpp 3232235786 52650 9676
 				// :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :VERSION
 					
 				if (strncmp(text.c_str(), "\1DCC ", 5) == 0)
-				{
-					u->GetExt("dccallow_list", dl);
-		
-					if (dl)
+				{	
+					if (u->GetExt("dccallow_list", dl) && dl->size())
 					{
-						if (dl->size())
-						{
-							for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
-							{
-								if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
-								{
-									return 0;
-								}
-							}
-						}
+						for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
+							if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
+								return 0;
 					}
 		
 					// tokenize
-					stringstream ss(text);
+					std::stringstream ss(text);
 					std::string buf;
-					vector<string> tokens;
+					std::vector<std::string> tokens;
 		
 					while (ss >> buf)
 						tokens.push_back(buf);
 		
 					irc::string type = tokens[1].c_str();
-					ServerInstance->Log(DEBUG, "m_dccallow.so: got DCC type %s", type.c_str());
 		
 					bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0);
 		
@@ -357,29 +334,24 @@ class ModuleDCCAllow : public Module
 						std::string filename = tokens[2];
 					
 						if (defaultaction == "allow") 
-						{
 							return 0;
-						}
 				
 						for (unsigned int i = 0; i < bfl.size(); i++)
 						{
 							if (ServerInstance->MatchText(filename, bfl[i].filemask))
 							{
-								if (strcmp(bfl[i].action.c_str(), "allow") == 0)
-								{
+								if (bfl[i].action == "allow")
 									return 0;
-								}
 							}
 							else
 							{
 								if (defaultaction == "allow")
-								{
 									return 0;
-								}
 							}
 							user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick, u->nick, filename.c_str());
 							u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, filename.c_str());
 							u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+							return 1;
 						}
 					}
 					else if ((type == "CHAT") && (blockchat))
@@ -387,8 +359,8 @@ class ModuleDCCAllow : public Module
 						user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick, u->nick);
 						u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick, user->nick, user->ident, user->dhost);
 						u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+						return 1;
 					}
-					return 1;
 				}
 			}
 		}
@@ -399,24 +371,22 @@ class ModuleDCCAllow : public Module
 	{
 		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
 		{
-			userrec* u = (userrec*)(*iter);
-			u->GetExt("dccallow_list", dl);
-	
-			if (dl)
+			User* u = (User*)(*iter);
+			if (u->GetExt("dccallow_list", dl))
 			{
 				if (dl->size())
 				{
-					dccallowlist::iterator iter = dl->begin();
-					while (iter != dl->end())
+					dccallowlist::iterator iter2 = dl->begin();
+					while (iter2 != dl->end())
 					{
-						if ((iter->set_on + iter->length) <= ServerInstance->Time())
+						if ((iter2->set_on + iter2->length) <= ServerInstance->Time())
 						{
-							u->WriteServ("997 %s %s :DCCALLOW entry for %s has expired", u->nick, u->nick, iter->nickname.c_str());
-							iter = dl->erase(iter);
+							u->WriteServ("997 %s %s :DCCALLOW entry for %s has expired", u->nick, u->nick, iter2->nickname.c_str());
+							iter2 = dl->erase(iter2);
 						}
 						else
 						{
-							++iter;
+							++iter2;
 						}
 					}
 				}
@@ -424,20 +394,17 @@ class ModuleDCCAllow : public Module
 			else
 			{
 				RemoveFromUserlist(u);
-				ServerInstance->Log(DEBUG, "m_dccallow.so: UH OH! Couldn't get DCCALLOW list for %s", u->nick);
 			}
 		}
 	}
 	
-	void RemoveNick(userrec* user)
+	void RemoveNick(User* user)
 	{
 		/* Iterate through all DCCALLOW lists and remove user */
 		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
 		{
-			userrec *u = (userrec*)(*iter);
-			u->GetExt("dccallow_list", dl);
-	
-			if (dl)
+			User *u = (User*)(*iter);
+			if (u->GetExt("dccallow_list", dl))
 			{
 				if (dl->size())
 				{
@@ -461,12 +428,12 @@ class ModuleDCCAllow : public Module
 		}
 	}
 
-	void RemoveFromUserlist(userrec *user)
+	void RemoveFromUserlist(User *user)
 	{
 		// remove user from userlist
 		for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
 		{
-			userrec* u = (userrec*)(*j);
+			User* u = (User*)(*j);
 			if (u == user)
 			{
 				ul.erase(j);
@@ -496,29 +463,9 @@ class ModuleDCCAllow : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_COMMON,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
-class ModuleDCCAllowFactory : public ModuleFactory
-{
- public:
-	ModuleDCCAllowFactory()
-	{
-	}
+MODULE_INIT(ModuleDCCAllow)
 
-	~ModuleDCCAllowFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleDCCAllow(Me);
-	}
-
-};
-
-extern "C" void * init_module( void )
-{
-	return new ModuleDCCAllowFactory;
-}