#include <string>
#include <sstream>
#include <vector>
-#include <sched.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
+#include <algorithm>
#include "users.h"
#include "globals.h"
#include "modules.h"
#include "dynamic.h"
#include "wildcard.h"
-#include "message.h"
#include "mode.h"
#include "commands.h"
#include "xline.h"
#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
+
#include "hashcomp.h"
#include "socketengine.h"
#include "userprocess.h"
#define nspace __gnu_cxx
-extern InspIRCd* ServerInstance;
-
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
-extern std::vector<userrec*> local_users;
-
-extern int MODCOUNT;
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
-extern time_t TIME;
-
-// 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[MAX_DESCRIPTORS];
-
-extern Server* MyServer;
-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;
* Therefore, we need to deal with both lists concurrently. The first instance of this method does that by creating
* two instances of irc::commasepstream and reading them both together until the first runs out of tokens.
* The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc.
- * Both will only parse until they reach Config->MaxTargets number of targets, to stop abuse via spam.
+ * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
*/
int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
{
irc::commasepstream items1(parameters[splithere]);
irc::commasepstream items2(parameters[extra]);
std::string item = "";
- int max = 0;
+ unsigned int max = 0;
/* Attempt to iterate these lists and call the command objech
* which called us, for every parameter pair until there are
* no more left to parse.
*/
- while (((item = items1.GetToken()) != "") && (max++ < Config->MaxTargets))
+ while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
{
std::string extrastuff = items2.GetToken();
parameters[splithere] = item.c_str();
/* Only one commasepstream here */
irc::commasepstream items1(parameters[splithere]);
std::string item = "";
- int max = 0;
+ unsigned int max = 0;
/* Parse the commasepstream until there are no tokens remaining.
* Each token we parse out, call the command handler that called us
* with it
*/
- while (((item = items1.GetToken()) != "") && (max++ < Config->MaxTargets))
+ while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
{
parameters[splithere] = item.c_str();
CommandObj->Handle(parameters,pcnt,user);
{
if (n->second->flags_needed)
{
- return ((user->HasPermission(commandname)) || (is_uline(user->server)));
+ return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
}
return true;
}
while (((para[items] = tokens.GetToken()) != "") && (items < 127))
command_p[items] = para[items++].c_str();
- for (std::string::iterator makeupper = command.begin(); makeupper != command.end(); makeupper++)
- *makeupper = toupper(*makeupper);
+ std::transform(command.begin(), command.end(), command.begin(), ::toupper);
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false));
if (user)
{
/* activity resets the ping pending timer */
- user->nping = TIME + user->pingmax;
- if (items < cm->second->min_params)
- {
- log(DEBUG,"not enough parameters: %s %s",user->nick,command.c_str());
- WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command.c_str());
- return;
- }
+ user->nping = ServerInstance->Time() + user->pingmax;
if (cm->second->flags_needed)
{
if (!user->IsModeSet(cm->second->flags_needed))
{
- log(DEBUG,"permission denied: %s %s",user->nick,command.c_str());
- WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
+ user->WriteServ("481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
+ return;
+ }
+ if (!user->HasPermission(command))
+ {
+ user->WriteServ("481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
return;
}
}
- if ((cm->second->flags_needed) && (!user->HasPermission(command)))
+ if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled()))
{
- log(DEBUG,"permission denied: %s %s",user->nick,command.c_str());
- WriteServ(user->fd,"481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
+ /* command is disabled! */
+ user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
return;
}
- if ((user->registered == 7) && (!*user->oper) && (cm->second->IsDisabled()))
+ if (items < cm->second->min_params)
{
- /* command is disabled! */
- WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command.c_str());
+ user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
+ /* If syntax is given, display this as the 461 reply */
+ if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length()))
+ user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
return;
}
- if ((user->registered == 7) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass))
+ if ((user->registered == REG_ALL) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass))
{
/* ikky /stats counters */
cm->second->use_count++;
}
else
{
- WriteServ(user->fd,"451 %s :You have not registered",command.c_str());
+ user->WriteServ("451 %s :You have not registered",command.c_str());
return;
}
}
else if (user)
{
ServerInstance->stats->statsUnknown++;
- WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command.c_str());
+ user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
}
}
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());
+ ServerInstance->Log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());
cmdlist.erase(i);
go_again = true;
break;
while ((a = buffer.find("\r")) != std::string::npos)
buffer.erase(a);
- log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
-
- this->ProcessCommand(user,buffer);
+ if (buffer.length())
+ {
+ ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
+ this->ProcessCommand(user,buffer);
+ }
}
bool CommandParser::CreateCommand(command_t *f)
if (cmdlist.find(f->command) == cmdlist.end())
{
cmdlist[f->command] = f;
- log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
+ ServerInstance->Log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
return true;
}
else return false;
}
-CommandParser::CommandParser()
+CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
{
this->SetupCommandTable();
}
* 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;
+ command_user = new cmd_user(ServerInstance);
+ command_nick = new cmd_nick(ServerInstance);
+ command_pass = new cmd_pass(ServerInstance);
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_pong);
- this->CreateCommand(new cmd_admin);
- this->CreateCommand(new cmd_privmsg);
- this->CreateCommand(new cmd_info);
- this->CreateCommand(new cmd_time);
- this->CreateCommand(new cmd_whois);
- this->CreateCommand(new cmd_wallops);
- this->CreateCommand(new cmd_notice);
- this->CreateCommand(new cmd_join);
- this->CreateCommand(new cmd_names);
- this->CreateCommand(new cmd_part);
- this->CreateCommand(new cmd_kick);
- this->CreateCommand(new cmd_mode);
- this->CreateCommand(new cmd_topic);
- this->CreateCommand(new cmd_who);
- this->CreateCommand(new cmd_motd);
- this->CreateCommand(new cmd_rules);
- this->CreateCommand(new cmd_oper);
- this->CreateCommand(new cmd_list);
- this->CreateCommand(new cmd_die);
- this->CreateCommand(new cmd_restart);
- this->CreateCommand(new cmd_kill);
- this->CreateCommand(new cmd_rehash);
- this->CreateCommand(new cmd_lusers);
- this->CreateCommand(new cmd_stats);
- this->CreateCommand(new cmd_userhost);
- this->CreateCommand(new cmd_away);
- this->CreateCommand(new cmd_ison);
- this->CreateCommand(new cmd_summon);
- this->CreateCommand(new cmd_users);
- this->CreateCommand(new cmd_invite);
- this->CreateCommand(new cmd_trace);
- this->CreateCommand(new cmd_whowas);
- this->CreateCommand(new cmd_connect);
- this->CreateCommand(new cmd_squit);
- this->CreateCommand(new cmd_modules);
- this->CreateCommand(new cmd_links);
- this->CreateCommand(new cmd_map);
- this->CreateCommand(new cmd_kline);
- this->CreateCommand(new cmd_gline);
- this->CreateCommand(new cmd_zline);
- this->CreateCommand(new cmd_qline);
- this->CreateCommand(new cmd_eline);
- this->CreateCommand(new cmd_loadmodule);
- this->CreateCommand(new cmd_unloadmodule);
- this->CreateCommand(new cmd_server);
- this->CreateCommand(new cmd_commands);
+ this->CreateCommand(new cmd_quit(ServerInstance));
+ this->CreateCommand(new cmd_version(ServerInstance));
+ this->CreateCommand(new cmd_ping(ServerInstance));
+ this->CreateCommand(new cmd_pong(ServerInstance));
+ this->CreateCommand(new cmd_admin(ServerInstance));
+ this->CreateCommand(new cmd_privmsg(ServerInstance));
+ this->CreateCommand(new cmd_info(ServerInstance));
+ this->CreateCommand(new cmd_time(ServerInstance));
+ this->CreateCommand(new cmd_whois(ServerInstance));
+ this->CreateCommand(new cmd_wallops(ServerInstance));
+ this->CreateCommand(new cmd_notice(ServerInstance));
+ this->CreateCommand(new cmd_join(ServerInstance));
+ this->CreateCommand(new cmd_names(ServerInstance));
+ this->CreateCommand(new cmd_part(ServerInstance));
+ this->CreateCommand(new cmd_kick(ServerInstance));
+ this->CreateCommand(new cmd_mode(ServerInstance));
+ this->CreateCommand(new cmd_topic(ServerInstance));
+ this->CreateCommand(new cmd_who(ServerInstance));
+ this->CreateCommand(new cmd_motd(ServerInstance));
+ this->CreateCommand(new cmd_rules(ServerInstance));
+ this->CreateCommand(new cmd_oper(ServerInstance));
+ this->CreateCommand(new cmd_list(ServerInstance));
+ this->CreateCommand(new cmd_die(ServerInstance));
+ this->CreateCommand(new cmd_restart(ServerInstance));
+ this->CreateCommand(new cmd_kill(ServerInstance));
+ this->CreateCommand(new cmd_rehash(ServerInstance));
+ this->CreateCommand(new cmd_lusers(ServerInstance));
+ this->CreateCommand(new cmd_stats(ServerInstance));
+ this->CreateCommand(new cmd_userhost(ServerInstance));
+ this->CreateCommand(new cmd_away(ServerInstance));
+ this->CreateCommand(new cmd_ison(ServerInstance));
+ this->CreateCommand(new cmd_summon(ServerInstance));
+ this->CreateCommand(new cmd_users(ServerInstance));
+ this->CreateCommand(new cmd_invite(ServerInstance));
+ this->CreateCommand(new cmd_trace(ServerInstance));
+ this->CreateCommand(new cmd_whowas(ServerInstance));
+ this->CreateCommand(new cmd_connect(ServerInstance));
+ this->CreateCommand(new cmd_squit(ServerInstance));
+ this->CreateCommand(new cmd_modules(ServerInstance));
+ this->CreateCommand(new cmd_links(ServerInstance));
+ this->CreateCommand(new cmd_map(ServerInstance));
+ this->CreateCommand(new cmd_kline(ServerInstance));
+ this->CreateCommand(new cmd_gline(ServerInstance));
+ this->CreateCommand(new cmd_zline(ServerInstance));
+ this->CreateCommand(new cmd_qline(ServerInstance));
+ this->CreateCommand(new cmd_eline(ServerInstance));
+ this->CreateCommand(new cmd_loadmodule(ServerInstance));
+ this->CreateCommand(new cmd_unloadmodule(ServerInstance));
+ this->CreateCommand(new cmd_server(ServerInstance));
+ this->CreateCommand(new cmd_commands(ServerInstance));
}
+
projects / user / henk / code / inspircd.git / blobdiff