* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
#include "command_parse.h"
#include "ctables.h"
+#ifdef GCC3
+#define nspace __gnu_cxx
+#else
+#define nspace std
+#endif
+
+
extern InspIRCd* ServerInstance;
extern std::vector<Module*> modules;
extern std::vector<userrec*> local_users;
extern int MODCOUNT;
-extern InspSocket* socket_ref[65535];
+extern InspSocket* socket_ref[MAX_DESCRIPTORS];
extern time_t TIME;
-extern SocketEngine* SE;
-
// 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[65536];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
extern Server* MyServer;
extern ServerConfig *Config;
char moo[MAXBUF];
for (int i = 0; i <32; i++)
- strcpy(blog[i],"");
+ *blog[i] = 0;
for (int i = 0; i <32; i++)
- strcpy(blog2[i],"");
+ *blog2[i] = 0;
- strcpy(moo,"");
+ *moo = 0;
for (int i = 0; i <10; i++)
{
if (!parameters[i])
{
return 0;
}
- strcpy(plist,"");
+ *plist = 0;
for (int i = start; i <= end; i++)
{
if (parameters[i])
plist[i] = '\0';
strlcpy(blog[j++],param,MAXBUF);
param = plist+i+1;
- if (j>20)
+ if ((unsigned int)j > Config->MaxTargets)
{
WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,blog[j-1]);
return 1;
bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * user)
{
- for (unsigned int i = 0; i < cmdlist.size(); i++)
- {
- if (cmdlist[i]->command == commandname)
- {
- if ((pcnt>=cmdlist[i]->min_params) && (cmdlist[i]->source != "<core>"))
+ nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ if (n != cmdlist.end())
+ {
+ if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
{
- if ((strchr(user->modes,cmdlist[i]->flags_needed)) || (!cmdlist[i]->flags_needed))
+ if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed))
{
- if (cmdlist[i]->flags_needed)
+ if (n->second->flags_needed)
{
if ((user->HasPermission(commandname)) || (is_uline(user->server)))
{
return true;
}
}
- }
}
return false;
}
void CommandParser::CallHandler(std::string &commandname,char **parameters, int pcnt, userrec *user)
{
- for (unsigned int i = 0; i < cmdlist.size(); i++)
+ nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ if (n != cmdlist.end())
{
- if (cmdlist[i]->command == commandname)
- {
- if (pcnt>=cmdlist[i]->min_params)
+ if (pcnt >= n->second->min_params)
{
- if ((strchr(user->modes,cmdlist[i]->flags_needed)) || (!cmdlist[i]->flags_needed))
+ if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed))
{
- if (cmdlist[i]->flags_needed)
+ if (n->second->flags_needed)
{
if ((user->HasPermission(commandname)) || (is_uline(user->server)))
{
- cmdlist[i]->Handle(parameters,pcnt,user);
+ n->second->Handle(parameters,pcnt,user);
}
}
else
{
- cmdlist[i]->Handle(parameters,pcnt,user);
+ n->second->Handle(parameters,pcnt,user);
}
}
}
- }
}
}
}
int total_params = 0;
- if (strlen(cmd)>2)
+ unsigned int xl = strlen(cmd);
+ if (xl > 2)
{
- for (unsigned int q = 0; q < strlen(cmd)-1; q++)
+ for (unsigned int q = 0; q < xl - 1; q++)
{
if ((cmd[q] == ' ') && (cmd[q+1] == ':'))
{
items = 0;
command_p[0] = NULL;
parameters = NULL;
- for (unsigned int i = 0; i <= strlen(cmd); i++)
+ unsigned int tl = strlen(cmd);
+ for (unsigned int i = 0; i <= tl; i++)
{
cmd[i] = toupper(cmd[i]);
}
}
else
{
- strcpy(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 < strlen(temp); i++)
+ for (unsigned int i = 0; i < vl; i++)
{
if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7))
{
}
/* split the full string into a command plus parameters */
parameters = p;
- strcpy(p," ");
+ p[0] = ' ';
+ p[1] = 0;
+
command = cmd;
if (strchr(cmd,' '))
{
- for (unsigned int i = 0; i <= strlen(cmd); i++)
+ unsigned int cl = strlen(cmd);
+ for (unsigned int i = 0; i <= cl; i++)
{
/* capitalise the command ONLY, leave params intact */
cmd[i] = toupper(cmd[i]);
}
else
{
- for (unsigned int i = 0; i <= strlen(cmd); i++)
+ for (char* i = cmd; *i; i++)
{
- cmd[i] = toupper(cmd[i]);
+ *i = toupper(*i);
}
}
}
- cmd_found = 0;
if (strlen(command)>MAXCOMMAND)
{
return;
}
- for (unsigned int x = 0; x < strlen(command); x++)
+ for (char* x = command; *x; x++)
{
- if (((command[x] < 'A') || (command[x] > 'Z')) && (command[x] != '.'))
+ if (((*x < 'A') || (*x > 'Z')) && (*x != '.'))
{
- if (((command[x] < '0') || (command[x]> '9')) && (command[x] != '-'))
+ if (((*x < '0') || (*x> '9')) && (*x != '-'))
{
- if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",command[x]))
+ if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",*x))
{
ServerInstance->stats->statsUnknown++;
WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
}
std::string xcommand = command;
- for (unsigned int i = 0; i != cmdlist.size(); i++)
- {
- if ((xcommand.length() >= cmdlist[i]->command.length()) && (xcommand == cmdlist[i]->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;
+ }
+
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false));
+ if (MOD_RESULT == 1) {
+ return;
+ }
+
+ nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(xcommand);
+
+ if (cm != cmdlist.end())
+ {
+ if (user)
{
- if (parameters)
+ /* activity resets the ping pending timer */
+ user->nping = TIME + user->pingmax;
+ if ((items) < cm->second->min_params)
{
- if (parameters[0])
- {
- items = this->ProcessParameters(command_p,parameters);
- }
- else
- {
- items = 0;
- command_p[0] = NULL;
- }
- }
- else
- {
- items = 0;
- command_p[0] = NULL;
+ 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)
- {
- /* activity resets the ping pending timer */
- user->nping = TIME + user->pingmax;
- if ((items) < cmdlist[i]->min_params)
- {
- log(DEBUG,"not enough parameters: %s %s",user->nick,command);
- WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command);
- return;
- }
- if ((!strchr(user->modes,cmdlist[i]->flags_needed)) && (cmdlist[i]->flags_needed))
+ if ((!strchr(user->modes,cm->second->flags_needed)) && (cm->second->flags_needed))
{
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;
return;
}
- if ((cmdlist[i]->flags_needed) && (!user->HasPermission(xcommand)))
+ if ((cm->second->flags_needed) && (!user->HasPermission(xcommand)))
{
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);
/* ikky /stats counters */
if (temp)
{
- cmdlist[i]->use_count++;
- cmdlist[i]->total_bytes+=strlen(temp);
+ cm->second->use_count++;
+ cm->second->total_bytes+=strlen(temp);
}
int MOD_RESULT = 0;
- FOREACH_RESULT(OnPreCommand(command,command_p,items,user));
+ FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true));
if (MOD_RESULT == 1) {
return;
}
* command handler call, as the handler
* may free the user structure! */
- cmdlist[i]->Handle(command_p,items,user);
+ cm->second->Handle(command_p,items,user);
return;
}
else
return;
}
}
- cmd_found = 1;
- }
}
- if ((!cmd_found) && (user))
+ else if (user)
{
ServerInstance->stats->statsUnknown++;
WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
while (go_again)
{
go_again = false;
- for (std::deque<command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
+ for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
{
- command_t* x = (command_t*)*i;
+ 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());
bool CommandParser::CreateCommand(command_t *f)
{
/* create the command and push it onto the table */
- cmdlist.push_back(f);
+ cmdlist[f->command] = f;
log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
return true;
}
projects / user / henk / code / inspircd.git / blobdiff