X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dccallow.cpp;h=90c63e30d80c25c36822667964f96716b21600f8;hb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;hp=bc298c2c23356c99c54899a69764da7fe47fc624;hpb=d32c5c0090c10c0ebfc221c0d1f3d25912808fb7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index bc298c2c2..90c63e30d 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -1,27 +1,30 @@
- /* m_dccallow - Jamie Penman-Smithson <jamie@silverdream.org> - September 2006 */
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
 
-using namespace std;
-
-#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 */
 
 static ConfigReader *Conf;
 
-class BannedFileList
+class BannedFileList : public classbase
 {
  public:
 	std::string filemask;
 	std::string action;
 };
 
-class DCCAllow
+class DCCAllow : public classbase
 {
  public:
 	std::string nickname;
@@ -31,92 +34,92 @@ class DCCAllow
 
 	DCCAllow() { }
 
-	DCCAllow(std::string nick, std::string hm, time_t so, long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
+	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, Module* parent) : Command(Me, parent, "DCCALLOW", 0, 0)
 	{
-		this->source = "m_dccallow.so";
-		syntax = "{[+|-]<nick> <time>}";
+		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 std::vector<std::string> &parameters, User *user)
 	{
 		/* syntax: DCCALLOW [+|-]<nick> (<time>) */
-		if (!pcnt)
+		if (!parameters.size())
 		{
 			// display current DCCALLOW list
 			DisplayDCCAllowList(user);
-			return CMD_SUCCESS;
+			return CMD_FAILURE;
 		}
-		else if (pcnt > 0)
+		else if (parameters.size() > 0)
 		{
-			char action = *parameters[0];
-		
+			char action = *parameters[0].c_str();
+
 			// if they didn't specify an action, this is probably a command
 			if (action != '+' && action != '-')
 			{
-				if (!strcasecmp(parameters[0], "LIST"))
+				if (!strcasecmp(parameters[0].c_str(), "LIST"))
 				{
 					// list current DCCALLOW list
 					DisplayDCCAllowList(user);
-					return CMD_SUCCESS;
-				} 
-				else if (!strcasecmp(parameters[0], "HELP"))
+					return CMD_FAILURE;
+				}
+				else if (!strcasecmp(parameters[0].c_str(), "HELP"))
 				{
 					// display help
 					DisplayHelp(user);
-					return CMD_SUCCESS;
+					return CMD_FAILURE;
+				}
+				else
+				{
+					user->WriteNumeric(998, "%s :DCCALLOW command not understood. For help on DCCALLOW, type /DCCALLOW HELP", user->nick.c_str());
+					return CMD_FAILURE;
 				}
 			}
-			
-			std::string nick = parameters[0] + 1;
-			userrec *target = ServerInstance->FindNick(nick);
-	
+
+			std::string nick = parameters[0].substr(1);
+			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->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
+								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);
-							if (u->nick == user->nick)
+							User* u = (User*)(*j);
+							if (u == user)
 							{
 								ul.erase(j);
 								break;
@@ -126,34 +129,38 @@ 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 (target == user)
+					{
+						user->WriteNumeric(996, "%s %s :You cannot add yourself to your own DCCALLOW list!", user->nick.c_str(), user->nick.c_str());
+						return CMD_FAILURE;
+					}
+
+					if (!user->GetExt("dccallow_list", dl))
 					{
 						dl = new dccallowlist;
-						user->Extend(std::string("dccallow_list"), dl);
+						user->Extend("dccallow_list", dl);
 						// add this user to the userlist
 						ul.push_back(user);
 					}
+
 					for (dccallowlist::const_iterator k = dl->begin(); k != dl->end(); ++k)
 					{
 						if (k->nickname == target->nick)
 						{
-							user->WriteServ("996 %s %s :%s is already on your DCCALLOW list", user->nick, user->nick, target->nick);
-							return CMD_SUCCESS;
+							user->WriteNumeric(996, "%s %s :%s is already on your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
+							return CMD_FAILURE;
 						}
 					}
-				
+
 					std::string mask = std::string(target->nick)+"!"+std::string(target->ident)+"@"+std::string(target->dhost);
-					std::string default_length = Conf->ReadValue("dccallow", "length", 0).c_str();
-		
+					std::string default_length = Conf->ReadValue("dccallow", "length", 0);
+
 					long length;
-					if (pcnt == 1 || ServerInstance->Duration(parameters[1]) < 1)
+					if (parameters.size() < 2)
 					{
-						length = ServerInstance->Duration(default_length.c_str());
-					} 
-					else if (parameters[1] == 0)
+						length = ServerInstance->Duration(default_length);
+					}
+					else if (!atoi(parameters[1].c_str()))
 					{
 						length = 0;
 					}
@@ -161,300 +168,290 @@ class cmd_dccallow : public command_t
 					{
 						length = ServerInstance->Duration(parameters[1]);
 					}
-	
+
 					if (!ServerInstance->IsValidMask(mask.c_str()))
 					{
 						return CMD_FAILURE;
 					}
-			
+
 					dl->push_back(DCCAllow(target->nick, mask, ServerInstance->Time(), length));
-			
+
 					if (length > 0)
 					{
-						user->WriteServ("993 %s %s :Added %s to DCCALLOW list for %d seconds", user->nick, user->nick, target->nick, length);
+						user->WriteNumeric(993, "%s %s :Added %s to DCCALLOW list for %ld seconds", user->nick.c_str(), user->nick.c_str(), target->nick.c_str(), length);
 					}
 					else
 					{
-						user->WriteServ("994 %s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
+						user->WriteNumeric(994, "%s %s :Added %s to DCCALLOW list for this session", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
 					}
-				
+
+					/* route it. */
 					return CMD_SUCCESS;
 				}
 			}
 			else
 			{
 				// nick doesn't exist
-				user->WriteServ("401 %s %s :No such nick/channel", user->nick, nick.c_str());
+				user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), nick.c_str());
 				return CMD_FAILURE;
 			}
 		}
-		return CMD_SUCCESS;
+		return CMD_FAILURE;
 	}
 
-void DisplayHelp(userrec* 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);
-	user->WriteServ("998 %s :DCC allow for the user you want to receive DCCs from.", user->nick);
-	user->WriteServ("998 %s :For example, to allow the user Brain to send you inspircd.exe", user->nick);
-	user->WriteServ("998 %s :you would type:", user->nick);
-	user->WriteServ("998 %s :/DCCALLOW +Brain", user->nick);
-	user->WriteServ("998 %s :Brain would then be able to send you files. They would have to", user->nick);
-	user->WriteServ("998 %s :resend the file again if the server gave them an error message", user->nick);
-	user->WriteServ("998 %s :before you added them to your DCCALLOW list.", user->nick);
-	user->WriteServ("998 %s :DCCALLOW entries will be temporary by default, if you want to add", user->nick);
-	user->WriteServ("998 %s :them to your DCCALLOW list until you leave IRC, type:", user->nick);
-	user->WriteServ("998 %s :/DCCALLOW +Brain 0", user->nick);
-	user->WriteServ("998 %s :To remove the user from your DCCALLOW list, type:", user->nick);
-	user->WriteServ("998 %s :/DCCALLOW -Brain", user->nick);
-	user->WriteServ("998 %s :To see the users in your DCCALLOW list, type:", user->nick);
-	user->WriteServ("998 %s :/DCCALLOW LIST", user->nick);
-	user->WriteServ("998 %s :NOTE: If the user leaves IRC or changes their nickname", user->nick);
-	user->WriteServ("998 %s :  they will be removed from your DCCALLOW list.", user->nick);
-	user->WriteServ("998 %s :  your DCCALLOW list will be deleted when you leave IRC.", user->nick);
-	user->WriteServ("999 %s :End of DCCALLOW HELP", user->nick);
-}
-
-void DisplayDCCAllowList(userrec* user)
-{
-	 // display current DCCALLOW list
-	user->WriteServ("990 %s :Users on your DCCALLOW list:", user->nick);
-	user->GetExt("dccallow_list", dl);
-	
-	if (dl)
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
+
+	void DisplayHelp(User* user)
+	{
+		user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick.c_str());
+		user->WriteNumeric(998, "%s :You may allow DCCs from specific users by specifying a", user->nick.c_str());
+		user->WriteNumeric(998, "%s :DCC allow for the user you want to receive DCCs from.", user->nick.c_str());
+		user->WriteNumeric(998, "%s :For example, to allow the user Brain to send you inspircd.exe", user->nick.c_str());
+		user->WriteNumeric(998, "%s :you would type:", user->nick.c_str());
+		user->WriteNumeric(998, "%s :/DCCALLOW +Brain", user->nick.c_str());
+		user->WriteNumeric(998, "%s :Brain would then be able to send you files. They would have to", user->nick.c_str());
+		user->WriteNumeric(998, "%s :resend the file again if the server gave them an error message", user->nick.c_str());
+		user->WriteNumeric(998, "%s :before you added them to your DCCALLOW list.", user->nick.c_str());
+		user->WriteNumeric(998, "%s :DCCALLOW entries will be temporary by default, if you want to add", user->nick.c_str());
+		user->WriteNumeric(998, "%s :them to your DCCALLOW list until you leave IRC, type:", user->nick.c_str());
+		user->WriteNumeric(998, "%s :/DCCALLOW +Brain 0", user->nick.c_str());
+		user->WriteNumeric(998, "%s :To remove the user from your DCCALLOW list, type:", user->nick.c_str());
+		user->WriteNumeric(998, "%s :/DCCALLOW -Brain", user->nick.c_str());
+		user->WriteNumeric(998, "%s :To see the users in your DCCALLOW list, type:", user->nick.c_str());
+		user->WriteNumeric(998, "%s :/DCCALLOW LIST", user->nick.c_str());
+		user->WriteNumeric(998, "%s :NOTE: If the user leaves IRC or changes their nickname", user->nick.c_str());
+		user->WriteNumeric(998, "%s :  they will be removed from your DCCALLOW list.", user->nick.c_str());
+		user->WriteNumeric(998, "%s :  your DCCALLOW list will be deleted when you leave IRC.", user->nick.c_str());
+		user->WriteNumeric(999, "%s :End of DCCALLOW HELP", user->nick.c_str());
+	}
+
+	void DisplayDCCAllowList(User* user)
 	{
-		for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
+		 // display current DCCALLOW list
+		user->WriteNumeric(990, "%s :Users on your DCCALLOW list:", user->nick.c_str());
+
+		if (user->GetExt("dccallow_list", dl))
 		{
-			user->WriteServ("991 %s %s :%s (%s)", user->nick, user->nick, c->nickname.c_str(), c->hostmask.c_str());
+			for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
+			{
+				user->WriteNumeric(991, "%s %s :%s (%s)", user->nick.c_str(), user->nick.c_str(), c->nickname.c_str(), c->hostmask.c_str());
+			}
 		}
+
+		user->WriteNumeric(992, "%s :End of DCCALLOW list", user->nick.c_str());
 	}
-	
-	user->WriteServ("992 %s :End of DCCALLOW list", user->nick);
-}			
 
 };
-	
+
 class ModuleDCCAllow : public Module
 {
-	cmd_dccallow* mycommand;
+	CommandDccallow cmd;
  public:
-	ModuleDCCAllow(InspIRCd* Me)
-		: Module::Module(Me)
-{
-	Conf = new ConfigReader(ServerInstance);
-	mycommand = new cmd_dccallow(ServerInstance);
-	ServerInstance->AddCommand(mycommand);
-	ReadFileConf();
-}
 
-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)
-{
-	delete Conf;
-	Conf = new ConfigReader(ServerInstance);
-}
+	ModuleDCCAllow(InspIRCd* Me)
+		: Module(Me), cmd(Me, this)
+	{
+		Conf = new ConfigReader(ServerInstance);
+		ServerInstance->AddCommand(&cmd);
+		ReadFileConf();
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPreNick, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
+	}
 
-virtual void OnUserQuit(userrec* user, const std::string &reason)
-{
-	dccallowlist* dl;
 
-	// remove their DCCALLOW list if they have one
-	user->GetExt("dccallow_list", dl);
-	if (dl)
+	virtual void OnRehash(User* user)
 	{
-		DELETE(dl);
-		user->Shrink("dccallow_list");
-		RemoveFromUserlist(user);
+		delete Conf;
+		Conf = new ConfigReader(ServerInstance);
+		ReadFileConf();
 	}
-	
-	// remove them from any DCCALLOW lists
-	// they are currently on
-	RemoveNick(user);
-}
 
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
+	{
+		dccallowlist* udl;
 
-virtual int OnUserPreNick(userrec* user, const std::string &newnick)
-{
-	RemoveNick(user);
-	return 0;
-}
+		// remove their DCCALLOW list if they have one
+		if (user->GetExt("dccallow_list", udl))
+		{
+			delete udl;
+			user->Shrink("dccallow_list");
+			RemoveFromUserlist(user);
+		}
 
-virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status)
-{
-	return OnUserPreNotice(user, dest, target_type, text, status);
-}
+		// remove them from any DCCALLOW lists
+		// they are currently on
+		RemoveNick(user);
+	}
 
-virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status)
-{
-	Expire();
 
-	if (target_type == TYPE_USER)
+	virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
 	{
-		userrec* u = (userrec*)dest;
-	
-		if ((text.length()) && (text[0] == '\1'))
+		RemoveNick(user);
+		return MOD_RES_PASSTHRU;
+	}
+
+	virtual ModResult 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 ModResult OnUserPreNotice(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	{
+		if (!IS_LOCAL(user))
+			return MOD_RES_PASSTHRU;
+
+		if (target_type == TYPE_USER)
 		{
-			// :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)
+			User* u = (User*)dest;
+
+			/* Always allow a user to dcc themselves (although... why?) */
+			if (user == u)
+				return MOD_RES_PASSTHRU;
+
+			if ((text.length()) && (text[0] == '\1'))
 			{
-				u->GetExt("dccallow_list", dl);
-	
-				if (dl)
+				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)
 				{
-					if (dl->size())
+					if (u->GetExt("dccallow_list", dl) && dl->size())
 					{
 						for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
-						{
-							if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
-							{
-								return 0;
-							}
-						}
+							if (InspIRCd::Match(user->GetFullHost(), iter->hostmask))
+								return MOD_RES_PASSTHRU;
 					}
-				}
-	
-				// tokenize
-				stringstream ss(text);
-				std::string buf;
-				vector<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);
-	
-				if (type == "SEND")
-				{
-					std::string defaultaction = Conf->ReadValue("dccallow", "action", 0);
-					std::string filename = tokens[2];
-				
-					if (defaultaction == "allow") 
-					{
-						return 0;
-					}
-			
-					for (unsigned int i = 0; i < bfl.size(); i++)
+
+					// tokenize
+					std::stringstream ss(text);
+					std::string buf;
+					std::vector<std::string> tokens;
+
+					while (ss >> buf)
+						tokens.push_back(buf);
+
+					irc::string type = tokens[1].c_str();
+
+					bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0);
+
+					if (type == "SEND")
 					{
-						if (ServerInstance->MatchText(filename, bfl[i].filemask))
-						{
-							if (strcmp(bfl[i].action.c_str(), "allow") == 0)
-							{
-								return 0;
-							}
-						}
-						else
+						std::string defaultaction = Conf->ReadValue("dccallow", "action", 0);
+						std::string filename = tokens[2];
+
+						bool found = false;
+						for (unsigned int i = 0; i < bfl.size(); i++)
 						{
-							if (defaultaction == "allow")
+							if (InspIRCd::Match(filename, bfl[i].filemask, ascii_case_insensitive_map))
 							{
-								return 0;
+								/* We have a matching badfile entry, override whatever the default action is */
+								if (bfl[i].action == "allow")
+									return MOD_RES_PASSTHRU;
+								else
+								{
+									found = true;
+									break;
+								}
 							}
 						}
-						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);
+
+						/* only follow the default action if no badfile matches were found above */
+						if ((!found) && (defaultaction == "allow"))
+							return MOD_RES_PASSTHRU;
+
+						user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick.c_str(), u->nick.c_str(), filename.c_str());
+						u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), 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.c_str(), user->nick.c_str());
+						return MOD_RES_DENY;
+					}
+					else if ((type == "CHAT") && (blockchat))
+					{
+						user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick.c_str(), u->nick.c_str());
+						u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.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.c_str(), user->nick.c_str());
+						return MOD_RES_DENY;
 					}
 				}
-				else if ((type == "CHAT") && (blockchat))
-				{
-					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 MOD_RES_PASSTHRU;
 	}
-	return 0;
-}
 
-void Expire()
-{
-	for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+	void Expire()
 	{
-		userrec* u = (userrec*)(*iter);
-		u->GetExt("dccallow_list", dl);
-
-		if (dl)
+		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
 		{
-			if (dl->size())
+			User* u = (User*)(*iter);
+			if (u->GetExt("dccallow_list", dl))
 			{
-				dccallowlist::iterator iter = dl->begin();
-				while (iter != dl->end())
+				if (dl->size())
 				{
-					if ((iter->set_on + iter->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);
-					}
-					else
+					dccallowlist::iterator iter2 = dl->begin();
+					while (iter2 != dl->end())
 					{
-						++iter;
+						if (iter2->length != 0 && (iter2->set_on + iter2->length) <= ServerInstance->Time())
+						{
+							u->WriteNumeric(997, "%s %s :DCCALLOW entry for %s has expired", u->nick.c_str(), u->nick.c_str(), iter2->nickname.c_str());
+							iter2 = dl->erase(iter2);
+						}
+						else
+						{
+							++iter2;
+						}
 					}
 				}
 			}
-		}
-		else
-		{
-			DELETE(dl);
-			u->Shrink("dccallow_list");
-			RemoveFromUserlist(u);
-			ServerInstance->Log(DEBUG, "m_dccallow.so: UH OH! Couldn't get DCCALLOW list for %s", u->nick);
+			else
+			{
+				RemoveFromUserlist(u);
+			}
 		}
 	}
-}
 
-void RemoveNick(userrec* user)
-{
-	/* Iterate through all DCCALLOW lists and remove user */
-	for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+	void RemoveNick(User* user)
 	{
-		userrec *u = (userrec*)(*iter);
-		u->GetExt("dccallow_list", dl);
-
-		if (dl)
+		/* Iterate through all DCCALLOW lists and remove user */
+		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
 		{
-			if (dl->size())
+			User *u = (User*)(*iter);
+			if (u->GetExt("dccallow_list", dl))
 			{
-				for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
+				if (dl->size())
 				{
-					if (i->nickname == user->nick)
+					for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
 					{
-				
-						u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick, i->nickname.c_str());
-						u->WriteServ("995 %s %s :Removed %s from your DCCALLOW list", u->nick, u->nick, i->nickname.c_str());
-						dl->erase(i);
-						break;
+						if (i->nickname == user->nick)
+						{
+
+							u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick.c_str(), i->nickname.c_str());
+							u->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", u->nick.c_str(), u->nick.c_str(), i->nickname.c_str());
+							dl->erase(i);
+							break;
+						}
 					}
 				}
 			}
-		}
-		else
-		{
-			DELETE(dl);
-			u->Shrink("dccallow_list");
-			RemoveFromUserlist(u);
+			else
+			{
+				RemoveFromUserlist(u);
+			}
 		}
 	}
-}
 
-	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);
-			if (u->nick == user->nick)
+			User* u = (User*)(*j);
+			if (u == user)
 			{
-					ul.erase(j);
+				ul.erase(j);
 				break;
 			}
 		}
@@ -472,38 +469,19 @@ void RemoveNick(userrec* user)
 			bf.action = action;
 			bfl.push_back(bf);
 		}
-	
+
 	}
 
 	virtual ~ModuleDCCAllow()
 	{
+		delete Conf;
+		Conf = NULL;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON,API_VERSION);
-	}
-};
-
-class ModuleDCCAllowFactory : public ModuleFactory
-{
- public:
-	ModuleDCCAllowFactory()
-	{
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-
-	~ModuleDCCAllowFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleDCCAllow(Me);
-	}
-
 };
 
-extern "C" void * init_module( void )
-{
-	return new ModuleDCCAllowFactory;
-}
+MODULE_INIT(ModuleDCCAllow)