#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 "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 int MODCOUNT;
-extern time_t TIME;
-
-extern Server* MyServer;
-
-extern chan_hash chanlist;
-
/* Special commands which may occur without registration of the user */
cmd_user* command_user;
cmd_nick* command_nick;
{
if (n->second->flags_needed)
{
- return ((user->HasPermission(commandname)) || (is_uline(user->server)));
+ return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
}
return true;
}
if (user)
{
/* activity resets the ping pending timer */
- user->nping = TIME + user->pingmax;
+ user->nping = ServerInstance->Time() + user->pingmax;
if (cm->second->flags_needed)
{
if (!user->IsModeSet(cm->second->flags_needed))
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;
if (buffer.length())
{
- log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
+ ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
this->ProcessCommand(user,buffer);
}
}
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));
}
+