X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=4063edf385246e0f67387a17a9bfdf3c63158b00;hb=c16cda5d715241bb4bff8050bee942a8a34a72c0;hp=e98261e5883e31c55d01f4b26826cff3f791b042;hpb=12427e75fe175fe7a62f388281dd7ab5100c9dda;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index e98261e58..4063edf38 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -11,10 +11,9 @@ * --------------------------------------------------- */ -/* $Core: libIRCDcommand_parse */ +/* $Core */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "socketengine.h" #include "socket.h" @@ -27,7 +26,7 @@ #include #endif -int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, const char* hashtype) +int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) { int MOD_RESULT = 0; FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype)) @@ -35,7 +34,7 @@ int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, co return 0; if (MOD_RESULT == -1) return 1; - return strcmp(data,input); + return data != input; // this seems back to front, but returns 0 if they *match*, 1 else } /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. @@ -133,10 +132,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vectorHandle(new_parameters, user); dupes[item.c_str()] = true; @@ -151,7 +147,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vectorsecond; @@ -186,7 +182,7 @@ Command* CommandParser::GetHandler(const std::string &commandname) CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector& parameters, User *user) { - Commandable::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { @@ -288,13 +284,13 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) } /* find the command, check it exists */ - Commandable::iterator cm = cmdlist.find(command); + Commandtable::iterator cm = cmdlist.find(command); if (cm == cmdlist.end()) { if (user->registered == REG_ALL) { - user->WriteNumeric(421, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); } ServerInstance->stats->statsUnknown++; return true; @@ -318,33 +314,33 @@ 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.c_str()); + user->WriteNumeric(ERR_NOPRIVILEGES, "%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.c_str(),user->oper.c_str(),command.c_str()); + user->WriteNumeric(ERR_NOPRIVILEGES, "%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.c_str(),command.c_str()); + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%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.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.c_str(), command.c_str()); + user->WriteNumeric(ERR_NEEDMOREPARAMS, "%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.c_str(), cm->second->command.c_str(), cm->second->syntax.c_str()); + user->WriteNumeric(RPL_SYNTAX, "%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())) { - user->WriteNumeric(451, "%s :You have not registered",command.c_str()); + user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str()); return do_more; } else @@ -371,7 +367,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) void CommandParser::RemoveCommands(const char* source) { - Commandable::iterator i,safei; + Commandtable::iterator i,safei; for (i = cmdlist.begin(); i != cmdlist.end();) { safei = i; @@ -380,7 +376,7 @@ void CommandParser::RemoveCommands(const char* source) } } -void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source) +void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source) { Command* x = safei->second; if (x->source == std::string(source)) @@ -548,7 +544,7 @@ void CommandParser::SetupCommandTable(User* user) dirent* entry = NULL; while (0 != (entry = readdir(library))) { - if (match(entry->d_name, "cmd_*.so")) + if (InspIRCd::Match(entry->d_name, "cmd_*.so", NULL)) { if (!user) {