X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=ca533b5234080c60c1cd3351376e9cadb4d07829;hb=c4458ecc70025aeac7ca87115ed0a698e7bbcdad;hp=4e98696bd3b854ebb8eb296e413a0b7fbb8e15d9;hpb=7e709ca6554dfb530521ecbe6943d8578392d46b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 4e98696bd..ca533b523 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -43,6 +43,7 @@ #include "typedefs.h" #include "modules.h" #include "command_parse.h" +#include "dns.h" extern ServerConfig *Config; extern InspIRCd* ServerInstance; @@ -59,96 +60,8 @@ extern command_table cmdlist; class Server; -ExtModeList EMode; featurelist Features; -// returns true if an extended mode character is in use -bool ModeDefined(char modechar, int type) -{ - for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++) - { - if ((i->modechar == modechar) && (i->type == type)) - { - return true; - } - } - return false; -} - -bool ModeIsListMode(char modechar, int type) -{ - for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++) - { - if ((i->modechar == modechar) && (i->type == type) && (i->list == true)) - { - return true; - } - } - return false; -} - -bool ModeDefinedOper(char modechar, int type) -{ - for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++) - { - if ((i->modechar == modechar) && (i->type == type) && (i->needsoper == true)) - { - return true; - } - } - return false; -} - -// returns number of parameters for a custom mode when it is switched on -int ModeDefinedOn(char modechar, int type) -{ - for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++) - { - if ((i->modechar == modechar) && (i->type == type)) - { - return i->params_when_on; - } - } - return 0; -} - -// returns number of parameters for a custom mode when it is switched on -int ModeDefinedOff(char modechar, int type) -{ - for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++) - { - if ((i->modechar == modechar) && (i->type == type)) - { - return i->params_when_off; - } - } - return 0; -} - -// returns true if an extended mode character is in use -bool DoAddExtendedMode(char modechar, int type, bool requires_oper, int params_on, int params_off) -{ - if (ModeDefined(modechar,type)) { - return false; - } - EMode.push_back(ExtMode(modechar,type,requires_oper,params_on,params_off)); - return true; -} - -// turns a mode into a listmode -void ModeMakeList(char modechar) -{ - for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++) - { - if ((i->modechar == modechar) && (i->type == MT_CHANNEL)) - { - i->list = true; - return; - } - } - return; -} - // version is a simple class for holding a modules version number Version::Version(int major, int minor, int revision, int build, int flags) : Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags) { }; @@ -222,7 +135,6 @@ void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &par void Module::OnRehash(const std::string ¶meter) { } void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { } int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; } -int Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) { return false; } void Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { }; Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); } void Module::OnOper(userrec* user, const std::string &opertype) { }; @@ -240,8 +152,7 @@ int Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { void Module::OnLoadModule(Module* mod,const std::string &name) { }; void Module::OnUnloadModule(Module* mod,const std::string &name) { }; void Module::OnBackgroundTimer(time_t curtime) { }; -void Module::OnSendList(userrec* user, chanrec* channel, char mode) { }; -int Module::OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) { return 0; }; +int Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated) { return 0; }; bool Module::OnCheckReady(userrec* user) { return true; }; void Module::OnUserRegister(userrec* user) { }; int Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; }; @@ -351,7 +262,7 @@ long Server::PriorityBefore(const std::string &modulename) return PRIORITY_DONTCARE; } -bool Server::PublishFeature(std::string FeatureName, Module* Mod) +bool Server::PublishFeature(const std::string &FeatureName, Module* Mod) { if (Features.find(FeatureName) == Features.end()) { @@ -361,7 +272,7 @@ bool Server::PublishFeature(std::string FeatureName, Module* Mod) return false; } -bool Server::UnpublishFeature(std::string FeatureName) +bool Server::UnpublishFeature(const std::string &FeatureName) { featurelist::iterator iter = Features.find(FeatureName); @@ -372,7 +283,7 @@ bool Server::UnpublishFeature(std::string FeatureName) return true; } -Module* Server::FindFeature(std::string FeatureName) +Module* Server::FindFeature(const std::string &FeatureName) { featurelist::iterator iter = Features.find(FeatureName); @@ -382,6 +293,19 @@ Module* Server::FindFeature(std::string FeatureName) return iter->second; } +const std::string& Server::GetModuleName(Module* m) +{ + static std::string nothing = ""; /* Prevent compiler warning */ + for (int i = 0; i <= MODCOUNT; i++) + { + if (modules[i] == m) + { + return Config->module_names[i]; + } + } + return nothing; /* As above */ +} + void Server::RehashServer() { WriteOpers("*** Rehashing config file"); @@ -499,7 +423,7 @@ bool Server::IsUlined(const std::string &server) return is_uline(server.c_str()); } -bool Server::CallCommandHandler(const std::string &commandname, char** parameters, int pcnt, userrec* user) +bool Server::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user) { return ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user); } @@ -523,9 +447,9 @@ void Server::AddCommand(command_t *f) } } -void Server::SendMode(char **parameters, int pcnt, userrec *user) +void Server::SendMode(const char** parameters, int pcnt, userrec *user) { - ServerInstance->ModeGrok->ServerMode(parameters,pcnt,user); + //ServerInstance->ModeGrok->ServerMode(parameters,pcnt,user); } void Server::Send(int Socket, const std::string &s) @@ -668,45 +592,24 @@ Admin Server::GetAdmin() } +bool Server::AddMode(ModeHandler* mh, const unsigned char mode) +{ + return ServerInstance->ModeGrok->AddMode(mh,mode); +} -bool Server::AddExtendedMode(char modechar, int type, bool requires_oper, int params_when_on, int params_when_off) +bool Server::AddModeWatcher(ModeWatcher* mw) { - if (((modechar >= 'A') && (modechar <= 'Z')) || ((modechar >= 'a') && (modechar <= 'z'))) - { - if (type == MT_SERVER) - { - ModuleException e("Modes of type MT_SERVER are reserved for future expansion"); - throw(e); - return false; - } - if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT)) - { - ModuleException e("Parameters on MT_CLIENT modes are not supported"); - throw(e); - return false; - } - if ((params_when_on>1) || (params_when_off>1)) - { - ModuleException e("More than one parameter for an MT_CHANNEL mode is not yet supported"); - throw(e); - return false; - } - return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off); - } - else - { - ModuleException e("Muppet modechar detected."); - throw(e); - } - return false; + return ServerInstance->ModeGrok->AddModeWatcher(mw); +} + +bool Server::DelModeWatcher(ModeWatcher* mw) +{ + return ServerInstance->ModeGrok->DelModeWatcher(mw); } -bool Server::AddExtendedListMode(char modechar) +bool Server::AddResolver(Resolver* r) { - bool res = DoAddExtendedMode(modechar,MT_CHANNEL,false,1,1); - if (res) - ModeMakeList(modechar); - return res; + return dns_add_class(r); } int Server::CountUsers(chanrec* c) @@ -714,7 +617,6 @@ int Server::CountUsers(chanrec* c) return usercount(c); } - bool Server::UserToPseudo(userrec* user, const std::string &message) { unsigned int old_fd = user->fd; @@ -780,21 +682,25 @@ bool Server::PseudoToUser(userrec* alive, userrec* zombie, const std::string &me void Server::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask) { add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str()); + apply_lines(APPLY_GLINES); } void Server::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname) { add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str()); + apply_lines(APPLY_QLINES); } void Server::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr) { add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str()); + apply_lines(APPLY_ZLINES); } void Server::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask) { add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str()); + apply_lines(APPLY_KLINES); } void Server::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask) @@ -1031,17 +937,43 @@ FileReader::FileReader(const std::string &filename) file_cache c; readfile(c,filename.c_str()); this->fc = c; + this->CalcSize(); } FileReader::FileReader() { } +std::string FileReader::Contents() +{ + std::string x = ""; + for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++) + { + x.append(*a); + x.append("\r\n"); + } + return x; +} + +unsigned long FileReader::ContentSize() +{ + return this->contentsize; +} + +void FileReader::CalcSize() +{ + unsigned long n = 0; + for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++) + n += (a->length() + 2); + this->contentsize = n; +} + void FileReader::LoadFile(const std::string &filename) { file_cache c; readfile(c,filename.c_str()); this->fc = c; + this->CalcSize(); }