* ---------------------------------------------------
*/
-using namespace std;
-
#include "inspircd_config.h"
#include "inspircd.h"
-#include "inspircd_io.h"
+#include "configreader.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/errno.h>
#include <sys/utsname.h>
#include <time.h>
#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
#include <sstream>
#include <vector>
-#include <deque>
#include <sched.h>
#ifdef THREADED_DNS
#include <pthread.h>
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!
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<std::string,command_t*>::iterator n = cmdlist.find(commandname);
{
if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
{
- if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed))
+ if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
{
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<std::string,command_t*>::iterator n = cmdlist.find(commandname);
{
if (pcnt >= n->second->min_params)
{
- if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed))
+ if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
{
if (n->second->flags_needed)
{
int CommandParser::ProcessParameters(char **command_p,char *parameters)
{
int j = 0;
- //int q = strlen(parameters);
if (!*parameters)
{
WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command);
return;
}
- if ((!strchr(user->modes,cm->second->flags_needed)) && (cm->second->flags_needed))
+ if (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 (!user->modes[cm->second->flags_needed-65])
+ {
+ 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 ((cm->second->flags_needed) && (!user->HasPermission(xcommand)))
{
}
/* 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))
{
}
}
}
- 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)
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);
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);
this->CreateCommand(new cmd_server);
this->CreateCommand(new cmd_commands);
}
-