]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
Cut down on debug on restart
[user/henk/code/inspircd.git] / src / command_parse.cpp
index 56e080c904af749ebb016e20bcb27e0298f29ae2..cb43df1a1bb15eb25896b061b450d6b03139cfbe 100644 (file)
-/*       +------------------------------------+
+       /*       +------------------------------------+
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include <sched.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
+#include "configreader.h"
+#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"
 
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
+bool InspIRCd::ULine(const char* server)
+{
+       if (!server)
+               return false;
+       if (!*server)
+               return true;
 
+       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
+}
 
-extern InspIRCd* ServerInstance;
+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 std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
-extern std::vector<userrec*> local_users;
+long InspIRCd::Duration(const char* str)
+{
+       char n_field[MAXBUF];
+       long total = 0;
+       n_field[0] = 0;
 
-extern int MODCOUNT;
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
-extern time_t TIME;
+       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;
 
-// 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];
+                               case 'm':
+                                       total += (atoi(n_field)*duration_m);
+                               break;
 
-extern Server* MyServer;
-extern ServerConfig *Config;
+                               case 'h':
+                                       total += (atoi(n_field)*duration_h);
+                               break;
 
-extern user_hash clientlist;
-extern chan_hash chanlist;
+                               case 'd':
+                                       total += (atoi(n_field)*duration_d);
+                               break;
 
-/* This function pokes and hacks at a parameter list like the following:
- *
- * PART #winbot,#darkgalaxy :m00!
- *
- * to turn it into a series of individual calls like this:
- *
- * PART #winbot :m00!
- * PART #darkgalaxy :m00!
- *
- * The seperate calls are sent to a callback function provided by the caller
- * (the caller will usually call itself recursively). The callback function
- * must be a command handler. Calling this function on a line with no list causes
- * no action to be taken. You must provide a starting and ending parameter number
- * where the range of the list can be found, useful if you have a terminating
- * parameter as above which is actually not part of the list, or parameters
- * before the actual list as well. This code is used by many functions which
- * can function as "one to list" (see the RFC) */
-
-int CommandParser::LoopCall(command_t* fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins)
-{
-       /* Copy of the parameter list, because like strltok, we make a bit of
-        * a mess of the parameter string we're given, and we want to keep this
-        * private.
-        */
-       char paramlist[MAXBUF];
-       /* Temporary variable used to hold one split parameter
-        */
-       char *param;
-       /* Parameter list, we can have up to 32 of these
-        */
-       char *pars[32];
-       /* Seperated items, e.g. holds the #one and #two from "#one,#two"
-        */
-       char *sep_items[32];
-       /* Seperated keys, holds the 'two' and 'three' of "two,three"
-        */
-       char *sep_keys[32];
-       /* Misc. counters, the total values hold the total number of
-        * seperated items in sep_items (total) and the total number of
-        * seperated items in sep_keys (total2)
-        */
-       int j = 0, q = 0, total = 0, total2 = 0;
-       /* A temporary copy of the comma seperated key list (see the description
-        * of the paramlist variable)
-        */
-       char keylist[MAXBUF];
-       /* Exactly what it says. Its nothing. We point invalid parameters at this.
-        */
-       char nothing = 0;
+                               case 'w':
+                                       total += (atoi(n_field)*duration_w);
+                               break;
 
-       /* First, initialize our arrays */
-       for (int i = 0; i < 32; i++)
-               sep_items[i] = sep_keys[i] = NULL;
+                               case 'y':
+                                       total += (atoi(n_field)*duration_y);
+                               break;
+                       }
+                       n_field[0] = 0;
+               }
+       }
+       // add trailing seconds
+       total += atoi(n_field);
+       
+       return total;
+}
 
-       /* Now find all parameters that are NULL, maybe above pcnt,
-        * and for safety, point them at 'nothing'
-        */
-       for (int i = 0; i < 10; i++)
+/* 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++)
        {
-               if (!parameters[i])
-               {
-                       parameters[i] = &nothing;
-               }
+               strlcpy(buffer,u->second->ident,MAXBUF);
+               charlcat(buffer,'@',MAXBUF);
+               strlcat(buffer,u->second->host,MAXBUF);
+               if (match(buffer,mask.c_str()))
+                       matches++;
        }
-       /* Check if we're doing JOIN handling. JOIN has two lists in
-        * it, potentially, if we have keys, so this is a special-case
-        * to handle the keys if they are provided.
-        */
-       if (joins)
+       float percent = ((float)matches / (float)clientlist.size()) * 100;
+       if (percent > (float)atof(itrigger))
        {
-               if (pcnt > 1) /* we have a key to copy */
-               {
-                       strlcpy(keylist,parameters[1],MAXBUF);
-               }
+               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;
+}
 
-       /* There's nothing to split! We don't do anything
-        */
-       if (!parameters[start] || (!strchr(parameters[start],',')))
+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++)
        {
-               return 0;
+               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;
+}
 
-       /* This function can handle multiple comma seperated
-        * lists as one, which is a feature no actual commands
-        * have yet -- this is futureproofing in case we encounter
-        * a command that  does.
-        */
-       *paramlist = 0;
+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 (int i = start; i <= end; i++)
+       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
-               if (parameters[i])
-               {
-                       strlcat(paramlist,parameters[i],MAXBUF);
-               }
+               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;
+}
 
-       /* Now we split off paramlist into seperate parameters using
-        * pointer voodoo, this parameter list goes into sep_items
+/* 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.
+ * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once,
+ * the channel names and their keys as follows:
+ * JOIN #chan1,#chan2,#chan3 key1,,key3
+ * 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 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)
+{
+       /* First check if we have more than one item in the list, if we don't we return zero here and the handler
+        * which called us just carries on as it was.
         */
-       j = 0;
-       param = paramlist;
+       if (!strchr(parameters[splithere],','))
+               return 0;
 
-       for (char* i = paramlist; *i; i++)
+       /** 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 = "*";
+       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++ < ServerInstance->Config->MaxTargets))
        {
-               /* Found an item */
-               if (*i == ',')
+               if (dupes.find(item.c_str()) == dupes.end())
                {
-                       *i = '\0';
-                       sep_items[j++] = param;
-                       /* Iterate along to next item, if there is one */
-                       param = i+1;
-                       if ((unsigned int)j > Config->MaxTargets)
-                       {
-                               /* BZZT! Too many items */
-                               WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,sep_items[j-1]);
+                       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;
                }
        }
-       sep_items[j++] = param;
-       total = j;
+       return 1;
+}
 
-       /* We add this extra comma here just to ensure we get all the keys
-        * in the event the user gave a malformed key string (yes, you guessed
-        * it, this is a mirc-ism)
+int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
+{
+       /* First check if we have more than one item in the list, if we don't we return zero here and the handler
+        * which called us just carries on as it was.
         */
-       if ((joins) && (*keylist) && (total>0)) // more than one channel and is joining
-       {
-               charlcat(keylist,',',MAXBUF);
-       }
+       if (!strchr(parameters[splithere],','))
+               return 0;
 
-       /* If we're doing JOIN handling (e.g. we've had to kludge for two
-        * lists being handled at once, real smart by the way JRO </sarcasm>)
-        * and we also have keys, we must seperate out this key list into
-        * our char** list sep_keys for later use.
-        */
-       if ((joins) && (*keylist))
-       {
-               /* There is more than one key */
-               if (strchr(keylist,','))
-               {
-                       j = 0;
-                       param = keylist;
-                       for (char* i = keylist; *i; i++)
-                       {
-                               if (*i == ',')
-                               {
-                                       *i = '\0';
-                                       sep_keys[j++] = param;
-                                       param = i+1;
-                               }
-                       }
+       std::map<irc::string, bool> dupes;
 
-                       sep_keys[j++] = param;
-                       total2 = j;
-               }
-       }
+       /* Only one commasepstream here */
+       ServerInstance->Log(DEBUG,"Splitting '%s'",parameters[splithere]);
+       irc::commasepstream items1(parameters[splithere]);
+       std::string item = "*";
+       unsigned int max = 0;
 
-       /* Now the easier bit. We call the command class's Handle function
-        * X times, where x is the number of parameters we've 'collated'.
+       /* Parse the commasepstream until there are no tokens remaining.
+        * Each token we parse out, call the command handler that called us
+        * with it
         */
-       for (j = 0; j < total; j++)
+       while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
        {
-               if (sep_items[j])
+               if (dupes.find(item.c_str()) == dupes.end())
                {
-                       pars[0] = sep_items[j];
-               }
+                       const char* new_parameters[127];
 
-               for (q = end; q < pcnt-1; q++)
-               {
-                       if (parameters[q+1])
-                       {
-                               pars[q-end+1] = parameters[q+1];
-                       }
-               }
+                       for (int t = 0; (t < pcnt) && (t < 127); t++)
+                               new_parameters[t] = parameters[t];
 
-               if ((joins) && (parameters[1]))
-               {
-                       if (pcnt > 1)
-                       {
-                               pars[1] = sep_keys[j];
-                       }
-                       else
-                       {
-                               pars[1] = NULL;
-                       }
-               }
+                       new_parameters[splithere] = item.c_str();
 
-               /* repeatedly call the function with the hacked parameter list */
-               if ((joins) && (pcnt > 1))
-               {
-                       if (pars[1])
-                       {
-                               /* pars[1] already set up and containing key from sep_keys[j] */
-                               fn->Handle(pars,2,u);
-                       }
-                       else
-                       {
-                               pars[1] = parameters[1];
-                               fn->Handle(pars,2,u);
-                       }
-               }
-               else
-               {
-                       fn->Handle(pars,pcnt-(end-start),u);
+                       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
+        * return without doing any processing.
+        */
        return 1;
 }
 
-bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * user)
+bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
 {
        nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
 
@@ -310,31 +305,31 @@ bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec *
        {
                if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
                {
-                       if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed))
+                       if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
                        {
                                if (n->second->flags_needed)
                                {
-                                       if ((user->HasPermission(commandname)) || (is_uline(user->server)))
-                                       {
-                                               return true;
-                                       }
-                                       else
-                                       {
-                                               return false;
-                                       }
+                                       return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
                                }
-
                                return true;
                        }
                }
        }
-
        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(std::string &commandname,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);
 
@@ -342,350 +337,108 @@ bool CommandParser::CallHandler(std::string &commandname,char **parameters, int
        {
                if (pcnt >= n->second->min_params)
                {
-                       if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed))
+                       if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
                        {
                                if (n->second->flags_needed)
                                {
                                        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;
 }
 
-int CommandParser::ProcessParameters(char **command_p,char *parameters)
+void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 {
-       int j = 0;
-       //int q = strlen(parameters);
-
-       if (!*parameters)
-       {
-               /* no parameters, command_p invalid! */
-               return 0;
-       }
-
-       if (*parameters == ':')
-       {
-               command_p[0] = parameters+1;
-               return 1;
-       }
+       const char *command_p[127];
+       int items = 0;
+       irc::tokenstream tokens(cmd);
+       std::string command = tokens.GetToken();
 
-       if (*parameters)
+       while (((para[items] = tokens.GetToken()) != "") && (items < 127))
        {
-               char* n = strchr(parameters,' ');
-               if ((!n) || (*parameters == ':'))
-               {
-                       /* only one parameter */
-                       command_p[0] = parameters;
-                       if (*parameters == ':')
-                       {
-                               if (n)
-                               {
-                                       command_p[0]++;
-                               }
-                       }
-
-                       return 1;
-               }
-       }
-
-       command_p[j++] = parameters;
-
-       for (char* i = parameters; *i; i++)
-       {
-               if (*i == ' ')
-               {
-                       command_p[j++] = i+1;
-                       *i = '\0';
-
-                       if (*command_p[j-1] == ':')
-                       {
-                               *command_p[j-1]++; /* remove dodgy ":" */
-                               break;
-                               /* parameter like this marks end of the sequence */
-                       }
-               }
-       }
-       return j; /* returns total number of items in the list */
-}
-
-void CommandParser::ProcessCommand(userrec *user, char* cmd)
-{
-       char *parameters;
-       char *command;
-       char *command_p[127];
-       char p[MAXBUF], temp[MAXBUF];
-       int j, items, cmd_found;
-       int total_params = 0;
-
-       for (int i = 0; i < 127; i++)
-               command_p[i] = NULL;
-
-       if (!user || !cmd || !*cmd)
-       {
-               return;
-       }
-
-       char* first_space = NULL;
-
-       /* If the command is > 2 characters (quick and dirty way to find out) */
-       if (*cmd && *(cmd+1) && *(cmd+2))
-       {
-               for (char* q = cmd; *q; q++)
-               {
-                       if (*q == ' ')
-                       {
-                               first_space = q;
-                               if (*(q+1) == ':')
-                               {
-                                       total_params++;
-                                       // found a 'trailing', we dont count them after this.
-                                       break;
-                               }
-                               else
-                                       total_params++;
-                       }
-               }
-       }
-
-       // another phidjit bug...
-       if (total_params > 126)
-       {
-               *first_space = 0;
-               WriteServ(user->fd,"421 %s %s :Too many parameters given",user->nick,cmd);
-               return;
-       }
-
-       strlcpy(temp,cmd,MAXBUF);
-
-       std::string tmp = cmd;
-
-       for (int i = 0; i <= MODCOUNT; i++)
-       {
-               std::string oldtmp = tmp;
-               modules[i]->OnServerRaw(tmp,true,user);
-               if (oldtmp != tmp)
-               {
-                       log(DEBUG,"A Module changed the input string!");
-                       log(DEBUG,"New string: %s",tmp.c_str());
-                       log(DEBUG,"Old string: %s",oldtmp.c_str());
-                       break;
-               }
-       }
-
-       strlcpy(cmd,tmp.c_str(),MAXBUF);
-       strlcpy(temp,cmd,MAXBUF);
-
-       char* has_space = strchr(cmd,' ');
-       int cm_length = 0;
-       if (!has_space)
-       {
-               /*
-                * no parameters, lets skip the formalities and not chop up
-                * the string
-                */
-               log(DEBUG,"About to preprocess command with no params");
-               items = 0;
-               command_p[0] = NULL;
-               parameters = NULL;
-               for (char* i = cmd; *i; i++,cm_length++)
-                       *i = toupper(*i);
-               command = cmd;
-       }
-       else
-       {
-               *cmd = 0;
-               j = 0;
-
-               /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */
-               for (char* i = temp; *i; i++)
-               {
-                       if ((*i != 10) && (*i != 13) && (*i != 0) && (*i != 7))
-                       {
-                               cmd[j++] = *i;
-                       }
-               }
-               cmd[j] = 0;
-
-               /* split the full string into a command plus parameters */
-               parameters = p;
-               p[0] = ' ';
-               p[1] = 0;
-
-               command = cmd;
-
-               if (has_space)
-               {
-                       for (char* i = cmd; *i; i++)
-                       {
-                               /* capitalise the command ONLY, leave params intact */
-                               *i = toupper(*i);
-                               /* are we nearly there yet?! :P */
-                               if (*i == ' ')
-                               {
-                                       command = cmd;
-                                       parameters = i+1;
-                                       *i = 0;
-                                       break;
-                               }
-                       }
-               }
-               else
-               {
-                       for (char* i = cmd; *i; i++,cm_length++)
-                       {
-                               *i = toupper(*i);
-                       }
-               }
-       }
-
-       if (cm_length > MAXCOMMAND)
-       {
-               WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command);
-               return;
-       }
-
-       for (char* x = command; *x; x++)
-       {
-               if (((*x < 'A') || (*x > 'Z')) && (*x != '.'))
-               {
-                       if (((*x < '0') || (*x> '9')) && (*x != '-'))
-                       {
-                               if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",*x))
-                               {
-                                       ServerInstance->stats->statsUnknown++;
-                                       WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
-                                       return;
-                               }
-                       }
-               }
-       }
-
-       std::string xcommand = command;
-       if ((user->registered != 7) && (xcommand == "SERVER"))
-       {
-               kill_link(user,"Server connection to non-server port");
-               return;
-       }
-       
-       /* Tweak by brain - why was this INSIDE the mainloop? */
-       if (parameters)
-       {
-                if (parameters[0])
-                {
-                        items = this->ProcessParameters(command_p,parameters);
-                }
-                else
-                {
-                        items = 0;
-                        command_p[0] = NULL;
-                }
-       }
-       else
-       {
-               items = 0;
-               command_p[0] = NULL;
+               command_p[items] = para[items].c_str();
+               items++;
        }
 
+       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;
        }
-       
-       nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(xcommand);
+
+       nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(command);
        
        if (cm != cmdlist.end())
        {
                if (user)
                {
                        /* activity resets the ping pending timer */
-                       user->nping = TIME + user->pingmax;
-                       if ((items) < cm->second->min_params)
+                       user->nping = ServerInstance->Time() + user->pingmax;
+                       if (cm->second->flags_needed)
                        {
-                               log(DEBUG,"not enough parameters: %s %s",user->nick,command);
-                               WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command);
-                               return;
+                               if (!user->IsModeSet(cm->second->flags_needed))
+                               {
+                                       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 ((!strchr(user->modes,cm->second->flags_needed)) && (cm->second->flags_needed))
+                       if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled()))
                        {
-                               log(DEBUG,"permission denied: %s %s",user->nick,command);
-                               WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
-                               cmd_found = 1;
+                               /* command is disabled! */
+                               user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
                                return;
                        }
-                       if ((cm->second->flags_needed) && (!user->HasPermission(xcommand)))
+                       if (items < cm->second->min_params)
                        {
-                               log(DEBUG,"permission denied: %s %s",user->nick,command);
-                               WriteServ(user->fd,"481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command);
-                               if (!IS_LOCAL(user))
-                                       WriteOpers("*** \2WARNING\2: Command '%s' not allowed for oper '%s', dropped.",command,user->nick);
-                               cmd_found = 1;
+                               user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
+                               /* If syntax is given, display this as the 461 reply */
+                               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 the command isnt USER, PASS, or NICK, and nick is empty,
-                        * deny command! */
-                       if ((strncmp(command,"USER",4)) && (strncmp(command,"NICK",4)) && (strncmp(command,"PASS",4)))
-                       {
-                               if ((!isnick(user->nick)) || (user->registered != 7))
-                               {
-                                       log(DEBUG,"not registered: %s %s",user->nick,command);
-                                       WriteServ(user->fd,"451 %s :You have not registered",command);
-                                       return;
-                               }
-                       }
-                       if ((user->registered == 7) && (!*user->oper) && (*Config->DisabledCommands))
-                       {
-                               std::stringstream dcmds(Config->DisabledCommands);
-                               std::string thiscmd;
-                               while (dcmds >> thiscmd)
-                               {
-                                       if (!strcasecmp(thiscmd.c_str(),command))
-                                       {
-                                               // command is disabled!
-                                               WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command);
-                                               return;
-                                       }
-                               }
-                       }
-                       if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4)))
+                       if ((user->registered == REG_ALL) || (cm->second->WorksBeforeReg()))
                        {
                                /* ikky /stats counters */
-                               if (temp)
-                               {
-                                       cm->second->use_count++;
-                                       cm->second->total_bytes+=strlen(temp);
-                               }
+                               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;
-                               }
 
                                /*
                                 * WARNING: nothing may come after the
                                 * 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);
+                               user->WriteServ("451 %s :You have not registered",command.c_str());
                                return;
                        }
                }
@@ -693,144 +446,195 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd)
        else if (user)
        {
                ServerInstance->stats->statsUnknown++;
-               WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
+               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::ProcessBuffer(const char* cmdbuf,userrec *user)
+void CommandParser::RemoveCommand(nspace::hash_map<std::string,command_t*>::iterator safei, const char* source)
 {
-       char cmd[MAXBUF];
-
-       if (!user || !cmdbuf || !*cmdbuf)
+       command_t* x = safei->second;
+       if (x->source == std::string(source))
        {
-               log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter");
-               return;
+               cmdlist.erase(safei);
        }
+}
 
-       while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces
+void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
+{
+       std::string::size_type a;
 
-       if (!*cmdbuf)
+       if (!user)
                return;
-       
-       strlcpy(cmd,cmdbuf,MAXBUF);
 
-       while (charremove(cmd,10));
-       while (charremove(cmd,13));
+       while ((a = buffer.rfind("\n")) != std::string::npos)
+               buffer.erase(a);
+       while ((a = buffer.rfind("\r")) != std::string::npos)
+               buffer.erase(a);
 
-       int sl = strlen(cmd)-1;
-       while (sl && (cmd[sl] == ' ')) // strip trailing spaces
+       if (buffer.length())
        {
-               cmd[sl--] = 0;
+               ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
+               this->ProcessCommand(user,buffer);
        }
+}
 
-       if (!sl)
-               return;
-
-       log(DEBUG,"CMDIN: %s %s",user->nick,cmd);
-
-       tidystring(cmd);
-
-       if (user && cmd)
+bool CommandParser::CreateCommand(command_t *f, void* so_handle)
+{
+       if (so_handle)
        {
-               this->ProcessCommand(user,cmd);
+               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;
+               }
        }
-}
 
-bool CommandParser::CreateCommand(command_t *f)
-{
        /* 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()
 {
-       this->CreateCommand(new cmd_user);
-       this->CreateCommand(new cmd_nick);
-       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_pass);
-       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));
 }