X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=cb43df1a1bb15eb25896b061b450d6b03139cfbe;hb=f5f71bdfefb84ccb69712ef6ed9f5ffc43733678;hp=157162bce90c4524a817c1249029a87c63cf62b7;hpb=4f22db0f87aac488c28054e59f17745035658765;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 157162bce..cb43df1a1 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -1,85 +1,193 @@
-/*       +------------------------------------+
+	/*       +------------------------------------+
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
-#include <string>
-#include <sstream>
-#include <vector>
-#include <sched.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
+#include <algorithm>
+#include <dirent.h>
+#include <dlfcn.h>
 #include "users.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
-#include "mode.h"
-#include "commands.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
 #include "socketengine.h"
-#include "userprocess.h"
 #include "socket.h"
-#include "dns.h"
-#include "typedefs.h"
 #include "command_parse.h"
-#include "ctables.h"
 
-#define nspace __gnu_cxx
+bool InspIRCd::ULine(const char* server)
+{
+	if (!server)
+		return false;
+	if (!*server)
+		return true;
 
-extern InspIRCd* ServerInstance;
+	return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
+}
 
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
-extern std::vector<userrec*> local_users;
+int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
+{
+	int MOD_RESULT = 0;
+	FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber))
+	Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
+	if (MOD_RESULT == 1)
+		return 0;
+	if (MOD_RESULT == -1)
+		return 1;
+	Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
+	return strcmp(data,input);
+}
 
-extern int MODCOUNT;
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
-extern time_t TIME;
+long InspIRCd::Duration(const char* str)
+{
+	char n_field[MAXBUF];
+	long total = 0;
+	n_field[0] = 0;
 
-// This table references users by file descriptor.
-// its an array to make it VERY fast, as all lookups are referenced
-// by an integer, meaning there is no need for a scan/search operation.
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+	if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y')))
+	{
+		std::string n = str;
+		n += 's';
+		return Duration(n.c_str());
+	}
+	
+	for (char* i = (char*)str; *i; i++)
+	{
+		// if we have digits, build up a string for the value in n_field,
+		// up to 10 digits in size.
+		if ((*i >= '0') && (*i <= '9'))
+		{
+			strlcat(n_field,i,10);
+		}
+		else
+		{
+			// we dont have a digit, check for numeric tokens
+			switch (tolower(*i))
+			{
+				case 's':
+					total += atoi(n_field);
+				break;
 
-extern Server* MyServer;
-extern ServerConfig *Config;
+				case 'm':
+					total += (atoi(n_field)*duration_m);
+				break;
 
-extern user_hash clientlist;
-extern chan_hash chanlist;
+				case 'h':
+					total += (atoi(n_field)*duration_h);
+				break;
 
-/* Special commands which may occur without registration of the user */
-cmd_user* command_user;
-cmd_nick* command_nick;
-cmd_pass* command_pass;
+				case 'd':
+					total += (atoi(n_field)*duration_d);
+				break;
 
+				case 'w':
+					total += (atoi(n_field)*duration_w);
+				break;
+
+				case 'y':
+					total += (atoi(n_field)*duration_y);
+				break;
+			}
+			n_field[0] = 0;
+		}
+	}
+	// add trailing seconds
+	total += atoi(n_field);
+	
+	return total;
+}
+
+/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
+
+bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
+{
+	char buffer[MAXBUF];
+	char itrigger[MAXBUF];
+	long matches = 0;
+	
+	if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
+		strlcpy(itrigger,"95.5",MAXBUF);
+	
+	if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
+		return false;
+	
+	for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+	{
+		strlcpy(buffer,u->second->ident,MAXBUF);
+		charlcat(buffer,'@',MAXBUF);
+		strlcat(buffer,u->second->host,MAXBUF);
+		if (match(buffer,mask.c_str()))
+			matches++;
+	}
+	float percent = ((float)matches / (float)clientlist.size()) * 100;
+	if (percent > (float)atof(itrigger))
+	{
+		WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent);
+		return true;
+	}
+	return false;
+}
+
+bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
+{
+	char itrigger[MAXBUF];
+	long matches = 0;
+	
+	if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
+		strlcpy(itrigger,"95.5",MAXBUF);
+	
+	if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
+		return false;
+	
+	for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+	{
+		if (match(u->second->GetIPString(),ip.c_str(),true))
+			matches++;
+	}
+	
+	float percent = ((float)matches / (float)clientlist.size()) * 100;
+	if (percent > (float)atof(itrigger))
+	{
+		WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent);
+		return true;
+	}
+	return false;
+}
+
+bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
+{
+	char itrigger[MAXBUF];
+	long matches = 0;
+	
+	if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
+		strlcpy(itrigger,"95.5",MAXBUF);
+	
+	if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
+		return false;
+
+	for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+	{
+		if (match(u->second->nick,nick.c_str()))
+			matches++;
+	}
+	
+	float percent = ((float)matches / (float)clientlist.size()) * 100;
+	if (percent > (float)atof(itrigger))
+	{
+		WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);
+		return true;
+	}
+	return false;
+}
 
 /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
  * There are two overriden versions of this method, one of which takes two potential lists and the other takes one.
@@ -89,7 +197,7 @@ cmd_pass* command_pass;
  * Therefore, we need to deal with both lists concurrently. The first instance of this method does that by creating
  * two instances of irc::commasepstream and reading them both together until the first runs out of tokens.
  * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc.
- * Both will only parse until they reach Config->MaxTargets number of targets, to stop abuse via spam.
+ * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
  */
 int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
 {
@@ -99,23 +207,42 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
 	if (!strchr(parameters[splithere],','))
 		return 0;
 
+	/** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm.
+	 * By using std::map (thanks for the idea w00t) we can cut this down a ton.
+	 * ...VOOODOOOO!
+	 */
+	std::map<irc::string, bool> dupes;
+
 	/* Create two lists, one for channel names, one for keys
 	 */
 	irc::commasepstream items1(parameters[splithere]);
 	irc::commasepstream items2(parameters[extra]);
-	std::string item = "";
+	std::string item = "*";
 	unsigned int max = 0;
 
 	/* Attempt to iterate these lists and call the command objech
 	 * which called us, for every parameter pair until there are
 	 * no more left to parse.
 	 */
-	while (((item = items1.GetToken()) != "") && (max++ < Config->MaxTargets))
+	while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
 	{
-		std::string extrastuff = items2.GetToken();
-		parameters[splithere] = item.c_str();
-		parameters[extra] = extrastuff.c_str();
-		CommandObj->Handle(parameters,pcnt,user);
+		if (dupes.find(item.c_str()) == dupes.end())
+		{
+			const char* new_parameters[127];
+
+			for (int t = 0; (t < pcnt) && (t < 127); t++)
+				new_parameters[t] = parameters[t];
+
+			std::string extrastuff = items2.GetToken();
+
+			new_parameters[splithere] = item.c_str();
+			new_parameters[extra] = extrastuff.c_str();
+
+			if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED)
+				return 1;
+
+			dupes[item.c_str()] = true;
+		}
 	}
 	return 1;
 }
@@ -128,19 +255,40 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
 	if (!strchr(parameters[splithere],','))
 		return 0;
 
+	std::map<irc::string, bool> dupes;
+
 	/* Only one commasepstream here */
+	ServerInstance->Log(DEBUG,"Splitting '%s'",parameters[splithere]);
 	irc::commasepstream items1(parameters[splithere]);
-	std::string item = "";
+	std::string item = "*";
 	unsigned int max = 0;
 
 	/* Parse the commasepstream until there are no tokens remaining.
 	 * Each token we parse out, call the command handler that called us
 	 * with it
 	 */
-	while (((item = items1.GetToken()) != "") && (max++ < Config->MaxTargets))
+	while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
 	{
-		parameters[splithere] = item.c_str();
-		CommandObj->Handle(parameters,pcnt,user);
+		if (dupes.find(item.c_str()) == dupes.end())
+		{
+			const char* new_parameters[127];
+
+			for (int t = 0; (t < pcnt) && (t < 127); t++)
+				new_parameters[t] = parameters[t];
+
+			new_parameters[splithere] = item.c_str();
+
+			parameters[splithere] = item.c_str();
+
+			/* Execute the command handler over and over. If someone pulls our user
+			 * record out from under us (e.g. if we /kill a comma sep list, and we're
+			 * in that list ourselves) abort if we're gone.
+			 */
+			if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED)
+				return 1;
+
+			dupes[item.c_str()] = true;
+		}
 	}
 	/* By returning 1 we tell our caller that nothing is to be done,
 	 * as all the previous calls handled the data. This makes the parent
@@ -161,7 +309,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
 			{
 				if (n->second->flags_needed)
 				{
-					return ((user->HasPermission(commandname)) || (is_uline(user->server)));
+					return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
 				}
 				return true;
 			}
@@ -170,9 +318,18 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
 	return false;
 }
 
+command_t* CommandParser::GetHandler(const std::string &commandname)
+{
+	nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+	if (n != cmdlist.end())
+		return n->second;
+
+	return NULL;
+}
+
 // calls a handler function for a command
 
-bool CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
+CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
 {
 	nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
 
@@ -186,37 +343,36 @@ bool CommandParser::CallHandler(const std::string &commandname,const char** para
 				{
 					if ((user->HasPermission(commandname)) || (!IS_LOCAL(user)))
 					{
-						n->second->Handle(parameters,pcnt,user);
-						return true;
+						return n->second->Handle(parameters,pcnt,user);
 					}
 				}
 				else
 				{
-					n->second->Handle(parameters,pcnt,user);
-					return true;
+					return n->second->Handle(parameters,pcnt,user);
 				}
 			}
 		}
 	}
-	return false;
+	return CMD_INVALID;
 }
 
 void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 {
 	const char *command_p[127];
 	int items = 0;
-	std::string para[127];
 	irc::tokenstream tokens(cmd);
 	std::string command = tokens.GetToken();
 
 	while (((para[items] = tokens.GetToken()) != "") && (items < 127))
-		command_p[items] = para[items++].c_str();
+	{
+		command_p[items] = para[items].c_str();
+		items++;
+	}
 
-	for (std::string::iterator makeupper = command.begin(); makeupper != command.end(); makeupper++)
-		*makeupper = toupper(*makeupper);
+	std::transform(command.begin(), command.end(), command.begin(), ::toupper);
 		
 	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false));
+	FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd));
 	if (MOD_RESULT == 1) {
 		return;
 	}
@@ -228,48 +384,42 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 		if (user)
 		{
 			/* activity resets the ping pending timer */
-			user->nping = TIME + user->pingmax;
+			user->nping = ServerInstance->Time() + user->pingmax;
 			if (cm->second->flags_needed)
 			{
 				if (!user->IsModeSet(cm->second->flags_needed))
 				{
-					WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
+					user->WriteServ("481 %s :Permission Denied- You do not have the required operator privileges",user->nick);
+					return;
+				}
+				if (!user->HasPermission(command))
+				{
+					user->WriteServ("481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
 					return;
 				}
-			}
-			if ((cm->second->flags_needed) && (!user->HasPermission(command)))
-			{
-				WriteServ(user->fd,"481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
-				return;
 			}
 			if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled()))
 			{
 				/* command is disabled! */
-				WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command.c_str());
+				user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
 				return;
 			}
 			if (items < cm->second->min_params)
 			{
+				user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
 				/* If syntax is given, display this as the 461 reply */
-				if (cm->second->syntax.length())
-				{
-					WriteServ(user->fd,"461 %s %s :Not enough parameters.", user->nick, command.c_str());
-					/* Use RPL_TEXT for this */
-					if (Config->SyntaxHints)
-						WriteServ(user->fd,"304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
-				}
-				else
-					WriteServ(user->fd,"461 %s %s :Not enough parameters", user->nick, command.c_str());
+				if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length()))
+					user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
 				return;
 			}
-			if ((user->registered == REG_ALL) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass))
+			if ((user->registered == REG_ALL) || (cm->second->WorksBeforeReg()))
 			{
 				/* ikky /stats counters */
 				cm->second->use_count++;
 				cm->second->total_bytes += cmd.length();
 
 				int MOD_RESULT = 0;
-				FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true));
+				FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd));
 				if (MOD_RESULT == 1)
 					return;
 
@@ -278,13 +428,17 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 				 * command handler call, as the handler
 				 * may free the user structure!
 				 */
+				CmdResult result = cm->second->Handle(command_p,items,user);
 
-				cm->second->Handle(command_p,items,user);
+				if (result != CMD_USER_DELETED)
+				{
+					FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
+				}
 				return;
 			}
 			else
 			{
-				WriteServ(user->fd,"451 %s :You have not registered",command.c_str());
+				user->WriteServ("451 %s :You have not registered",command.c_str());
 				return;
 			}
 		}
@@ -292,34 +446,39 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 	else if (user)
 	{
 		ServerInstance->stats->statsUnknown++;
-		WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command.c_str());
+		user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
 	}
 }
 
 bool CommandParser::RemoveCommands(const char* source)
 {
-	bool go_again = true;
-
-	while (go_again)
+	nspace::hash_map<std::string,command_t*>::iterator i,safei;
+	for (i = cmdlist.begin(); i != cmdlist.end(); i++)
 	{
-		go_again = false;
-
-		for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
+		safei = i;
+		safei++;
+		if (safei != cmdlist.end())
 		{
-			command_t* x = i->second;
-			if (x->source == std::string(source))
-			{
-				log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());
-				cmdlist.erase(i);
-				go_again = true;
-				break;
-			}
+			RemoveCommand(safei, source);
 		}
 	}
-
+	safei = cmdlist.begin();
+	if (safei != cmdlist.end())
+	{
+		RemoveCommand(safei, source);
+	}
 	return true;
 }
 
+void CommandParser::RemoveCommand(nspace::hash_map<std::string,command_t*>::iterator safei, const char* source)
+{
+	command_t* x = safei->second;
+	if (x->source == std::string(source))
+	{
+		cmdlist.erase(safei);
+	}
+}
+
 void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
 {
 	std::string::size_type a;
@@ -327,98 +486,155 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
 	if (!user)
 		return;
 
-	while ((a = buffer.find("\n")) != std::string::npos)
+	while ((a = buffer.rfind("\n")) != std::string::npos)
 		buffer.erase(a);
-	while ((a = buffer.find("\r")) != std::string::npos)
+	while ((a = buffer.rfind("\r")) != std::string::npos)
 		buffer.erase(a);
 
 	if (buffer.length())
 	{
-		log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
+		ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
 		this->ProcessCommand(user,buffer);
 	}
 }
 
-bool CommandParser::CreateCommand(command_t *f)
+bool CommandParser::CreateCommand(command_t *f, void* so_handle)
 {
+	if (so_handle)
+	{
+		if (RFCCommands.find(f->command) == RFCCommands.end())
+		{
+			RFCCommands[f->command] = so_handle;
+			ServerInstance->Log(DEFAULT,"Monitoring RFC-specified reloadable command at %8x",so_handle);
+		}
+		else
+		{
+			ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
+			return false;
+		}
+	}
+
 	/* create the command and push it onto the table */
 	if (cmdlist.find(f->command) == cmdlist.end())
 	{
 		cmdlist[f->command] = f;
-		log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
+		ServerInstance->Log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
 		return true;
 	}
 	else return false;
 }
 
-CommandParser::CommandParser()
+CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
 {
+	para.resize(128);
 	this->SetupCommandTable();
 }
 
+bool CommandParser::FindSym(void** v, void* h)
+{
+	*v = dlsym(h, "init_command");
+	const char* err = dlerror();
+	if (err)
+	{
+		ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err);
+		return false;
+	}
+	return true;
+}
+
+bool CommandParser::ReloadCommand(const char* cmd)
+{
+	char filename[MAXBUF];
+	char commandname[MAXBUF];
+	int y = 0;
+
+	for (const char* x = cmd; *x; x++, y++)
+		commandname[y] = toupper(*x);
+
+	commandname[y] = 0;
+
+	SharedObjectList::iterator command = RFCCommands.find(commandname);
+
+	if (command != RFCCommands.end())
+	{
+		command_t* cmdptr = cmdlist.find(commandname)->second;
+		cmdlist.erase(cmdlist.find(commandname));
+
+		for (char* x = commandname; *x; x++)
+			*x = tolower(*x);
+
+
+		delete cmdptr;
+		dlclose(command->second);
+		RFCCommands.erase(command);
+
+		snprintf(filename, MAXBUF, "cmd_%s.so", commandname);
+		this->LoadCommand(filename);
+
+		return true;
+	}
+
+	return false;
+}
+
+CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user)
+{
+	user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]);
+	if (ServerInstance->Parser->ReloadCommand(parameters[0]))
+	{
+		user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]);
+		ServerInstance->WriteOpers("*** RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]);
+		return CMD_SUCCESS;
+	}
+	else
+	{
+		user->WriteServ("NOTICE %s :*** Could not reload command '%s'", user->nick, parameters[0]);
+		return CMD_FAILURE;
+	}
+}
+
+void CommandParser::LoadCommand(const char* name)
+{
+	char filename[MAXBUF];
+	void* h;
+	command_t* (*cmd_factory_func)(InspIRCd*);
+
+	snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name);
+	ServerInstance->Log(DEBUG,"Load command: %s", filename);
+
+	h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
+
+	if (!h)
+	{
+		ServerInstance->Log(SPARSE, "Error loading core command: %s", dlerror());
+		return;
+	}
+
+	if (this->FindSym((void **)&cmd_factory_func, h))
+	{
+		command_t* newcommand = cmd_factory_func(ServerInstance);
+		this->CreateCommand(newcommand, h);
+	}
+}
+
 void CommandParser::SetupCommandTable()
 {
-	/* These three are special (can occur without
-	 * full user registration) and so are saved
-	 * for later use.
-	 */
-	command_user = new cmd_user;
-	command_nick = new cmd_nick;
-	command_pass = new cmd_pass;
-	this->CreateCommand(command_user);
-	this->CreateCommand(command_nick);
-	this->CreateCommand(command_pass);
-
-	/* The rest of these arent special. boo hoo.
-	 */
-	this->CreateCommand(new cmd_quit);
-	this->CreateCommand(new cmd_version);
-	this->CreateCommand(new cmd_ping);
-	this->CreateCommand(new cmd_pong);
-	this->CreateCommand(new cmd_admin);
-	this->CreateCommand(new cmd_privmsg);
-	this->CreateCommand(new cmd_info);
-	this->CreateCommand(new cmd_time);
-	this->CreateCommand(new cmd_whois);
-	this->CreateCommand(new cmd_wallops);
-	this->CreateCommand(new cmd_notice);
-	this->CreateCommand(new cmd_join);
-	this->CreateCommand(new cmd_names);
-	this->CreateCommand(new cmd_part);
-	this->CreateCommand(new cmd_kick);
-	this->CreateCommand(new cmd_mode);
-	this->CreateCommand(new cmd_topic);
-	this->CreateCommand(new cmd_who);
-	this->CreateCommand(new cmd_motd);
-	this->CreateCommand(new cmd_rules);
-	this->CreateCommand(new cmd_oper);
-	this->CreateCommand(new cmd_list);
-	this->CreateCommand(new cmd_die);
-	this->CreateCommand(new cmd_restart);
-	this->CreateCommand(new cmd_kill);
-	this->CreateCommand(new cmd_rehash);
-	this->CreateCommand(new cmd_lusers);
-	this->CreateCommand(new cmd_stats);
-	this->CreateCommand(new cmd_userhost);
-	this->CreateCommand(new cmd_away);
-	this->CreateCommand(new cmd_ison);
-	this->CreateCommand(new cmd_summon);
-	this->CreateCommand(new cmd_users);
-	this->CreateCommand(new cmd_invite);
-	this->CreateCommand(new cmd_trace);
-	this->CreateCommand(new cmd_whowas);
-	this->CreateCommand(new cmd_connect);
-	this->CreateCommand(new cmd_squit);
-	this->CreateCommand(new cmd_modules);
-	this->CreateCommand(new cmd_links);
-	this->CreateCommand(new cmd_map);
-	this->CreateCommand(new cmd_kline);
-	this->CreateCommand(new cmd_gline);
-	this->CreateCommand(new cmd_zline);
-	this->CreateCommand(new cmd_qline);
-	this->CreateCommand(new cmd_eline);
-	this->CreateCommand(new cmd_loadmodule);
-	this->CreateCommand(new cmd_unloadmodule);
-	this->CreateCommand(new cmd_server);
-	this->CreateCommand(new cmd_commands);
+	RFCCommands.clear();
+
+	DIR* library = opendir(LIBRARYDIR);
+	if (library)
+	{
+		dirent* entry = NULL;
+		while ((entry = readdir(library)))
+		{
+			if (match(entry->d_name, "cmd_*.so"))
+			{
+				this->LoadCommand(entry->d_name);
+			}
+		}
+		closedir(library);
+	}
+
+	this->CreateCommand(new cmd_reload(ServerInstance));
 }
+