Fix to give the proper target ip on connect, cookies to w00t and Jason

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 17334833860563c615647e50805bdc4e08c5d3b5..e98261e5883e31c55d01f4b26826cff3f791b042 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -50,6 +50,9 @@ int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, co
  */
 int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere, unsigned int extra)
 {
+       if (splithere >= parameters.size())
+               return 0;
+
        /* 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.
         */
@@ -99,6 +102,9 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 
 int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere)
 {
+       if (splithere >= parameters.size())
+               return 0;
+
        /* 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.
         */
@@ -267,10 +273,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
         * the rfc says they shouldnt but also says the ircd should
         * discard it if they do.
         */
-       if (*command.c_str() == ':')
+       if (command[0] == ':')
                tokens.GetToken(command);
 
-       while (tokens.GetToken(token) && (command_p.size() < MAXPARAMETERS))
+       while (tokens.GetToken(token) && (command_p.size() <= MAXPARAMETERS))
                command_p.push_back(token);
 
        std::transform(command.begin(), command.end(), command.begin(), ::toupper);
@@ -288,7 +294,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        {
                if (user->registered == REG_ALL)
                {
-                       user->WriteNumeric(421, "%s %s :Unknown command",user->nick,command.c_str());
+                       user->WriteNumeric(421, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
                }
                ServerInstance->stats->statsUnknown++;
                return true;
@@ -312,28 +318,28 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        {
                if (!user->IsModeSet(cm->second->flags_needed))
                {
-                       user->WriteNumeric(481, "%s :Permission Denied - You do not have the required operator privileges",user->nick);
+                       user->WriteNumeric(481, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
                        return do_more;
                }
                if (!user->HasPermission(command))
                {
-                       user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
+                       user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick.c_str(),user->oper.c_str(),command.c_str());
                        return do_more;
                }
        }
        if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
        {
                /* command is disabled! */
-               user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick,command.c_str());
+               user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick.c_str(),command.c_str());
                ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
-                               command.c_str(), user->nick, user->ident, user->host);
+                               command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
                return do_more;
        }
        if (command_p.size() < cm->second->min_params)
        {
-               user->WriteNumeric(461, "%s %s :Not enough parameters.", user->nick, command.c_str());
+               user->WriteNumeric(461, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str());
                if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
-                       user->WriteNumeric(304, "%s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
+                       user->WriteNumeric(304, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->command.c_str(), cm->second->syntax.c_str());
                return do_more;
        }
        if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
@@ -398,7 +404,7 @@ bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
 
        if (buffer.length())
        {
-               ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str());
+               ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick.c_str(), buffer.c_str());
                return this->ProcessCommand(user,buffer);
        }
 
@@ -466,7 +472,7 @@ bool CommandParser::ReloadCommand(std::string cmd, User* user)
                if (err)
                {
                        if (user)
-                               user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick, cmd.c_str(), err);
+                               user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick.c_str(), cmd.c_str(), err);
                        return false;
                }
 
@@ -481,16 +487,16 @@ CmdResult cmd_reload::Handle(const std::vector<std::string>& parameters, User *u
        if (parameters.size() < 1)
                return CMD_FAILURE;
 
-       user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0].c_str());
+       user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick.c_str(), parameters[0].c_str());
        if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
        {
-               user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0].c_str());
-               ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0].c_str());
+               user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str());
                return CMD_SUCCESS;
        }
        else
        {
-               user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick, parameters[0].c_str());
+               user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 }
@@ -554,7 +560,7 @@ void CommandParser::SetupCommandTable(User* user)
                                {
                                        if (user)
                                        {
-                                               user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick, entry->d_name, err);
+                                               user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick.c_str(), entry->d_name, err);
                                        }
                                        else
                                        {