Refactor port binding, warning not yet tested fully

[user/henk/code/inspircd.git] / src / command_parse.cpp

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 259d636d326402891845f2de873fc738adfc14c4..6fdf1800c7d34f04d5b3f59a53f38c7b4d12dc96 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -31,7 +31,15 @@ bool InspIRCd::ULine(const char* server)
        if (!*server)
                return true;
 
-       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
+       return (Config->ulines.find(server) != Config->ulines.end());
+}
+
+bool InspIRCd::SilentULine(const char* server)
+{
+       std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
+       if (n != Config->ulines.end())
+               return n->second;
+       else return false;
 }
 
 int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
@@ -45,6 +53,11 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
        return strcmp(data,input);
 }
 
+std::string InspIRCd::TimeString(time_t curtime)
+{
+       return std::string(ctime(&curtime),24);
+}
+
 long InspIRCd::Duration(const char* str)
 {
        char n_field[MAXBUF];
@@ -153,8 +166,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
                        new_parameters[splithere] = item.c_str();
                        new_parameters[extra] = extrastuff.c_str();
 
-                       if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED)
-                               return 1;
+                       CommandObj->Handle(new_parameters,pcnt,user);
 
                        dupes[item.c_str()] = true;
                }
@@ -198,8 +210,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
                         * 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;
+                       CommandObj->Handle(new_parameters,pcnt,user);
 
                        dupes[item.c_str()] = true;
                }
@@ -213,7 +224,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
 
 bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       command_table::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -234,7 +245,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
 
 command_t* CommandParser::GetHandler(const std::string &commandname)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       command_table::iterator n = cmdlist.find(commandname);
        if (n != cmdlist.end())
                return n->second;
 
@@ -245,7 +256,7 @@ command_t* CommandParser::GetHandler(const std::string &commandname)
 
 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);
+       command_table::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -275,9 +286,18 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
        const char *command_p[127];
        int items = 0;
        irc::tokenstream tokens(cmd);
-       std::string command = tokens.GetToken();
+       std::string command;
+       tokens.GetToken(command);
+
+       /* A client sent a nick prefix on their command (ick)
+        * rhapsody and some braindead bouncers do this --
+        * the rfc says they shouldnt but also says the ircd should
+        * discard it if they do.
+        */
+       if (*command.c_str() == ':')
+               tokens.GetToken(command);
 
-       while (((para[items] = tokens.GetToken()) != "") && (items < 127))
+       while (tokens.GetToken(para[items]) && (items < 127))
        {
                command_p[items] = para[items].c_str();
                items++;
@@ -291,7 +311,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                return;
        }
 
-       nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(command);
+       command_table::iterator cm = cmdlist.find(command);
        
        if (cm != cmdlist.end())
        {
@@ -322,7 +342,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                        {
                                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()))
+                               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
                                        user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
                                return;
                        }
@@ -344,10 +364,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                                 */
                                CmdResult result = cm->second->Handle(command_p,items,user);
 
-                               if (result != CMD_USER_DELETED)
-                               {
-                                       FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
-                               }
+                               FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
                                return;
                        }
                        else
@@ -366,7 +383,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 
 bool CommandParser::RemoveCommands(const char* source)
 {
-       nspace::hash_map<std::string,command_t*>::iterator i,safei;
+       command_table::iterator i,safei;
        for (i = cmdlist.begin(); i != cmdlist.end(); i++)
        {
                safei = i;
@@ -384,7 +401,7 @@ bool CommandParser::RemoveCommands(const char* source)
        return true;
 }
 
-void CommandParser::RemoveCommand(nspace::hash_map<std::string,command_t*>::iterator safei, const char* source)
+void CommandParser::RemoveCommand(command_table::iterator safei, const char* source)
 {
        command_t* x = safei->second;
        if (x->source == std::string(source))
@@ -407,8 +424,11 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
 
        if (buffer.length())
        {
-               ServerInstance->Log(DEBUG,"-> :%s %s",user->nick,buffer.c_str());
-               this->ProcessCommand(user,buffer);
+               if (!user->muted)
+               {
+                       ServerInstance->Log(DEBUG,"-> :%s %s",user->nick,buffer.c_str());
+                       this->ProcessCommand(user,buffer);
+               }
        }
 }