X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=7a26f209ba0d537e949fecec536270cbbf95b543;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=bd2f78e05667be13c455844c0b0ea1bf8f5d96df;hpb=59f0b6afc97cc77eb15814404b6e282a4fc8d10a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index bd2f78e05..7a26f209b 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -14,11 +14,9 @@ * --------------------------------------------------- */ -using namespace std; - #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include @@ -26,15 +24,8 @@ using namespace std; #include #include #include -#ifdef GCC3 -#include -#else -#include -#endif -#include #include #include -#include #include #ifdef THREADED_DNS #include @@ -89,6 +80,11 @@ extern ServerConfig *Config; extern user_hash clientlist; extern chan_hash chanlist; +/* Special commands which may occur without registration of the user */ +cmd_user* command_user; +cmd_nick* command_nick; +cmd_pass* command_pass; + /* This function pokes and hacks at a parameter list like the following: * * PART #winbot,#darkgalaxy :m00! @@ -302,7 +298,7 @@ int CommandParser::LoopCall(command_t* fn, char **parameters, int pcnt, userrec 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::iterator n = cmdlist.find(commandname); @@ -314,27 +310,18 @@ bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * { if (n->second->flags_needed) { - if ((user->HasPermission(commandname)) || (is_uline(user->server))) - { - return true; - } - else - { - return false; - } + return ((user->HasPermission(commandname)) || (is_uline(user->server))); } - return true; } } } - return false; } // calls a handler function for a command -bool CommandParser::CallHandler(std::string &commandname,char **parameters, int pcnt, userrec *user) +bool CommandParser::CallHandler(const std::string &commandname,char **parameters, int pcnt, userrec *user) { nspace::hash_map::iterator n = cmdlist.find(commandname); @@ -366,29 +353,29 @@ bool CommandParser::CallHandler(std::string &commandname,char **parameters, int int CommandParser::ProcessParameters(char **command_p,char *parameters) { int j = 0; - int q = strlen(parameters); - if (!q) + if (!*parameters) { /* no parameters, command_p invalid! */ return 0; } - if (parameters[0] == ':') + if (*parameters == ':') { command_p[0] = parameters+1; return 1; } - if (q) + if (*parameters) { - if ((strchr(parameters,' ')==NULL) || (parameters[0] == ':')) + char* n = strchr(parameters,' '); + if ((!n) || (*parameters == ':')) { /* only one parameter */ command_p[0] = parameters; - if (parameters[0] == ':') + if (*parameters == ':') { - if (strchr(parameters,' ') != NULL) + if (n) { command_p[0]++; } @@ -400,14 +387,14 @@ int CommandParser::ProcessParameters(char **command_p,char *parameters) command_p[j++] = parameters; - for (int i = 0; i <= q; i++) + for (char* i = parameters; *i; i++) { - if (parameters[i] == ' ') + if (*i == ' ') { - command_p[j++] = parameters+i+1; - parameters[i] = '\0'; + command_p[j++] = i+1; + *i = '\0'; - if (command_p[j-1][0] == ':') + if (*command_p[j-1] == ':') { *command_p[j-1]++; /* remove dodgy ":" */ break; @@ -415,7 +402,6 @@ int CommandParser::ProcessParameters(char **command_p,char *parameters) } } } - return j; /* returns total number of items in the list */ } @@ -427,7 +413,6 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) char p[MAXBUF], temp[MAXBUF]; int j, items, cmd_found; int total_params = 0; - unsigned int xl; for (int i = 0; i < 127; i++) command_p[i] = NULL; @@ -437,15 +422,17 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) return; } - xl = strlen(cmd); + char* first_space = NULL; - if (xl > 2) + /* If the command is > 2 characters (quick and dirty way to find out) */ + if (*cmd && *(cmd+1) && *(cmd+2)) { - for (unsigned int q = 0; q < xl - 1; q++) + for (char* q = cmd; *q; q++) { - if (cmd[q] == ' ') + if (*q == ' ') { - if (cmd[q+1] == ':') + first_space = q; + if (*(q+1) == ':') { total_params++; // found a 'trailing', we dont count them after this. @@ -460,7 +447,7 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) // another phidjit bug... if (total_params > 126) { - *(strchr(cmd,' ')) = '\0'; + *first_space = 0; WriteServ(user->fd,"421 %s %s :Too many parameters given",user->nick,cmd); return; } @@ -485,7 +472,9 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) strlcpy(cmd,tmp.c_str(),MAXBUF); strlcpy(temp,cmd,MAXBUF); - if (!strchr(cmd,' ')) + char* has_space = strchr(cmd,' '); + int cm_length = 0; + if (!has_space) { /* * no parameters, lets skip the formalities and not chop up @@ -495,11 +484,8 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) items = 0; command_p[0] = NULL; parameters = NULL; - unsigned int tl = strlen(cmd); - for (unsigned int i = 0; i <= tl; i++) - { - cmd[i] = toupper(cmd[i]); - } + for (char* i = cmd; *i; i++,cm_length++) + *i = toupper(*i); command = cmd; } else @@ -507,16 +493,15 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) *cmd = 0; j = 0; - unsigned int vl = strlen(temp); /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */ - for (unsigned int i = 0; i < vl; i++) + for (char* i = temp; *i; i++) { - if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7)) + if ((*i != 10) && (*i != 13) && (*i != 0) && (*i != 7)) { - cmd[j++] = temp[i]; - cmd[j] = 0; + cmd[j++] = *i; } } + cmd[j] = 0; /* split the full string into a command plus parameters */ parameters = p; @@ -525,34 +510,32 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) command = cmd; - if (strchr(cmd,' ')) + if (has_space) { - unsigned int cl = strlen(cmd); - - for (unsigned int i = 0; i <= cl; i++) + for (char* i = cmd; *i; i++) { /* capitalise the command ONLY, leave params intact */ - cmd[i] = toupper(cmd[i]); + *i = toupper(*i); /* are we nearly there yet?! :P */ - if (cmd[i] == ' ') + if (*i == ' ') { command = cmd; - parameters = cmd+i+1; - cmd[i] = '\0'; + parameters = i+1; + *i = 0; break; } } } else { - for (char* i = cmd; *i; i++) + for (char* i = cmd; *i; i++,cm_length++) { *i = toupper(*i); } } } - if (strlen(command)>MAXCOMMAND) + if (cm_length > MAXCOMMAND) { WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command); return; @@ -638,7 +621,7 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) } /* 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 ((cm->second != command_user) && (cm->second != command_nick) && (cm->second != command_pass)) { if ((!isnick(user->nick)) || (user->registered != 7)) { @@ -661,7 +644,7 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) } } } - if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4))) + if ((user->registered == 7) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass)) { /* ikky /stats counters */ if (temp) @@ -728,63 +711,36 @@ void CommandParser::ProcessBuffer(const char* cmdbuf,userrec *user) { char cmd[MAXBUF]; - if (!user) - { - log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); - return; - } - if (!cmdbuf) + if (!user || !cmdbuf || !*cmdbuf) { log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); return; } - if (!cmdbuf[0]) - { - return; - } while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces - strlcpy(cmd,cmdbuf,MAXBUF); - - if (!cmd[0]) - { + if (!*cmdbuf) return; - } + + strlcpy(cmd,cmdbuf,MAXBUF); + while (charremove(cmd,10)); + while (charremove(cmd,13)); - /* XXX - This is ugly as sin, and incomprehensible - why are we doing this twice, for instance? --w00t */ int sl = strlen(cmd)-1; - - if ((cmd[sl] == 13) || (cmd[sl] == 10)) - { - cmd[sl] = '\0'; - } - - sl = strlen(cmd)-1; - - if ((cmd[sl] == 13) || (cmd[sl] == 10)) + while (sl && (cmd[sl] == ' ')) // strip trailing spaces { - cmd[sl] = '\0'; + cmd[sl--] = 0; } - sl = strlen(cmd)-1; - - - while (cmd[sl] == ' ') // strip trailing spaces - { - cmd[sl] = '\0'; - sl = strlen(cmd)-1; - } - - if (!cmd[0]) - { + if (!sl) return; - } log(DEBUG,"CMDIN: %s %s",user->nick,cmd); + tidystring(cmd); - if ((user) && (cmd)) + + if (user && cmd) { this->ProcessCommand(user,cmd); } @@ -809,8 +765,19 @@ CommandParser::CommandParser() void CommandParser::SetupCommandTable() { - this->CreateCommand(new cmd_user); - this->CreateCommand(new cmd_nick); + /* 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); @@ -845,7 +812,6 @@ void CommandParser::SetupCommandTable() 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); @@ -863,4 +829,3 @@ void CommandParser::SetupCommandTable() this->CreateCommand(new cmd_server); this->CreateCommand(new cmd_commands); } -