X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=7505dd21edf2fb814a7098446b49abbde4532fd9;hb=ddb970dd670bcd905c8f34458f8fcf70e9fd89bd;hp=eaff59c2db51ab180a0851d4abb0e99afee34f8f;hpb=e381b06561228aaea752deda20a62c6dc99a560e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index eaff59c2d..7505dd21e 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -2,53 +2,30 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#include "inspircd_config.h" -//#include "inspircd.h" #include "configreader.h" -#include -#include -#include -#include -#include -#include -#include -#include #include "users.h" -#include "ctables.h" -#include "globals.h" #include "modules.h" -#include "dynamic.h" #include "wildcard.h" #include "mode.h" #include "xline.h" -#include "commands.h" -#include "inspstring.h" - -#include "hashcomp.h" #include "socket.h" #include "socketengine.h" -#include "typedefs.h" -#include "modules.h" #include "command_parse.h" #include "dns.h" #include "inspircd.h" // 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) +Version::Version(int major, int minor, int revision, int build, int flags, int api_ver) +: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags), API(api_ver) { } @@ -130,19 +107,20 @@ void Module::OnUserConnect(userrec* user) { } void Module::OnUserQuit(userrec* user, const std::string& message) { } void Module::OnUserDisconnect(userrec* user) { } void Module::OnUserJoin(userrec* user, chanrec* channel) { } +void Module::OnPostJoin(userrec* user, chanrec* channel) { } void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { } -void Module::OnRehash(const std::string ¶meter) { } +void Module::OnRehash(userrec* user, 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::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { return 0; } 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); } +Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); } void Module::OnOper(userrec* user, const std::string &opertype) { }; void Module::OnPostOper(userrec* user, const std::string &opertype) { }; void Module::OnInfo(userrec* user) { }; void Module::OnWhois(userrec* source, userrec* dest) { }; int Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; }; -int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; }; -int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; }; +int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; }; +int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; }; int Module::OnUserPreNick(userrec* user, const std::string &newnick) { return 0; }; void Module::OnUserPostNick(userrec* user, const std::string &oldnick) { }; int Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; }; @@ -151,12 +129,12 @@ 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) { }; -int Module::OnPreCommand(const std::string &command, const 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, const std::string &original_line) { return 0; }; +void Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) { }; bool Module::OnCheckReady(userrec* user) { return true; }; -void Module::OnUserRegister(userrec* user) { }; +int Module::OnUserRegister(userrec* user) { return 0; }; int Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; }; void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { }; -int Module::OnRawMode(userrec* user, chanrec* chan, char mode, const std::string ¶m, bool adding, int pcnt) { return 0; }; int Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; }; int Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; }; int Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; }; @@ -167,17 +145,18 @@ int Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { int Module::OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { return 0; }; void Module::OnEvent(Event* event) { return; }; char* Module::OnRequest(Request* request) { return NULL; }; -int Module::OnOperCompare(const std::string &password, const std::string &input) { return 0; }; +int Module::OnOperCompare(const std::string &password, const std::string &input, int tagnumber) { return 0; }; void Module::OnGlobalOper(userrec* user) { }; -void Module::OnGlobalConnect(userrec* user) { }; +void Module::OnPostConnect(userrec* user) { }; int Module::OnAddBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; }; int Module::OnDelBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; }; void Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { }; int Module::OnRawSocketWrite(int fd, const char* buffer, int count) { return 0; }; void Module::OnRawSocketClose(int fd) { }; +void Module::OnRawSocketConnect(int fd) { }; int Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; }; -void Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status) { }; -void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status) { }; +void Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { }; +void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { }; void Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason) { }; void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { }; void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { }; @@ -209,25 +188,10 @@ void Module::OnChannelDelete(chanrec* chan) { }; Priority Module::Prioritize() { return PRIORITY_DONTCARE; } void Module::OnSetAway(userrec* user) { }; void Module::OnCancelAway(userrec* user) { }; - -/* server is a wrapper class that provides methods to all of the C-style - * exports in the core - */ - -void InspIRCd::AddSocket(InspSocket* sock) -{ - this->module_sockets.push_back(sock); -} - -void InspIRCd::RemoveSocket(InspSocket* sock) -{ - for (std::vector::iterator a = this->module_sockets.begin(); a < this->module_sockets.end(); a++) - { - InspSocket* s = (InspSocket*)*a; - if (s == sock) - s->MarkAsClosed(); - } -} +int Module::OnUserList(userrec* user, chanrec* Ptr) { return 0; }; +int Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; }; +void Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) { }; +void Module::OnGarbageCollect() { }; long InspIRCd::PriorityAfter(const std::string &modulename) { @@ -284,9 +248,91 @@ Module* InspIRCd::FindFeature(const std::string &FeatureName) return iter->second; } +bool InspIRCd::PublishInterface(const std::string &InterfaceName, Module* Mod) +{ + interfacelist::iterator iter = Interfaces.find(InterfaceName); + + if (iter == Interfaces.end()) + { + modulelist ml; + ml.push_back(Mod); + Interfaces[InterfaceName] = std::make_pair(0, ml); + return true; + } + else + { + iter->second.second.push_back(Mod); + return true; + } + return false; +} + +bool InspIRCd::UnpublishInterface(const std::string &InterfaceName, Module* Mod) +{ + interfacelist::iterator iter = Interfaces.find(InterfaceName); + + if (iter == Interfaces.end()) + return false; + + for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++) + { + if (*x == Mod) + { + iter->second.second.erase(x); + if (iter->second.second.empty()) + Interfaces.erase(InterfaceName); + return true; + } + } + return false; +} + +modulelist* InspIRCd::FindInterface(const std::string &InterfaceName) +{ + interfacelist::iterator iter = Interfaces.find(InterfaceName); + if (iter == Interfaces.end()) + return NULL; + else + return &(iter->second.second); +} + +void InspIRCd::UseInterface(const std::string &InterfaceName) +{ + interfacelist::iterator iter = Interfaces.find(InterfaceName); + if (iter != Interfaces.end()) + iter->second.first++; + +} + +void InspIRCd::DoneWithInterface(const std::string &InterfaceName) +{ + interfacelist::iterator iter = Interfaces.find(InterfaceName); + if (iter != Interfaces.end()) + iter->second.first--; +} + +std::pair InspIRCd::GetInterfaceInstanceCount(Module* m) +{ + for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++) + { + for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++) + { + if (*x == m) + { + return std::make_pair(iter->second.first, iter->first); + } + } + } + return std::make_pair(0, ""); +} + const std::string& InspIRCd::GetModuleName(Module* m) { static std::string nothing = ""; /* Prevent compiler warning */ + + if (!this->GetModuleCount()) + return nothing; + for (int i = 0; i <= this->GetModuleCount(); i++) { if (this->modules[i] == m) @@ -300,19 +346,10 @@ const std::string& InspIRCd::GetModuleName(Module* m) void InspIRCd::RehashServer() { this->WriteOpers("*** Rehashing config file"); + this->RehashUsersAndChans(); this->Config->Read(false,NULL); -} - -void InspIRCd::DelSocket(InspSocket* sock) -{ - for (std::vector::iterator a = this->module_sockets.begin(); a < this->module_sockets.end(); a++) - { - if (*a == sock) - { - this->module_sockets.erase(a); - return; - } - } + this->ResetMaxBans(); + this->Res->Rehash(); } /* This is ugly, yes, but hash_map's arent designed to be @@ -325,7 +362,7 @@ void InspIRCd::DelSocket(InspSocket* sock) chanrec* InspIRCd::GetChannelIndex(long index) { int target = 0; - for (chan_hash::iterator n = this->chanlist.begin(); n != this->chanlist.end(); n++, target++) + for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++) { if (index == target) return n->second; @@ -398,66 +435,28 @@ bool InspIRCd::DelModeWatcher(ModeWatcher* mw) return this->Modes->DelModeWatcher(mw); } -bool InspIRCd::AddResolver(Resolver* r) +bool InspIRCd::AddResolver(Resolver* r, bool cached) { - return this->Res->AddResolverClass(r); + if (!cached) + return this->Res->AddResolverClass(r); + else + { + r->TriggerCachedResult(); + delete r; + return true; + } } bool InspIRCd::UserToPseudo(userrec* user, const std::string &message) { - unsigned int old_fd = user->GetFd(); - user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str()); - user->FlushWriteBuf(); - user->ClearBuffer(); - user->SetFd(FD_MAGIC_NUMBER); - - if (find(local_users.begin(),local_users.end(),user) != local_users.end()) - { - local_users.erase(find(local_users.begin(),local_users.end(),user)); - } - - this->SE->DelFd(user); - shutdown(old_fd,2); - close(old_fd); - return true; + throw CoreException("The InspIRCd::UsertoPseudo function should not be used in InspIRCd later than 1.0.x"); + return false; } bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message) { - zombie->SetFd(alive->GetFd()); - FOREACH_MOD_I(this,I_OnUserQuit,OnUserQuit(alive,message)); - alive->SetFd(FD_MAGIC_NUMBER); - alive->FlushWriteBuf(); - alive->ClearBuffer(); - // save these for later - std::string oldnick = alive->nick; - std::string oldhost = alive->host; - std::string oldident = alive->ident; - userrec::QuitUser(this,alive,message.c_str()); - if (find(local_users.begin(),local_users.end(),alive) != local_users.end()) - { - local_users.erase(find(local_users.begin(),local_users.end(),alive)); - } - // Fix by brain - cant write the user until their fd table entry is updated - zombie->Write(":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick); - for (std::vector::const_iterator i = zombie->chans.begin(); i != zombie->chans.end(); i++) - { - if (((ucrec*)(*i))->channel != NULL) - { - chanrec* Ptr = ((ucrec*)(*i))->channel; - zombie->WriteFrom(zombie,"JOIN %s",Ptr->name); - if (Ptr->topicset) - { - zombie->WriteServ("332 %s %s :%s", zombie->nick, Ptr->name, Ptr->topic); - zombie->WriteServ("333 %s %s %s %d", zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset); - } - Ptr->UserList(zombie); - zombie->WriteServ("366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name); - } - } - if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->GetFd() != FD_MAGIC_NUMBER)) - local_users.push_back(zombie); - return true; + throw CoreException("The InspIRCd::PseudotoUser function should not be used in InspIRCd later than 1.0.x"); + return false; } void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask) @@ -593,30 +592,40 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se this->error = CONF_FILE_NOT_FOUND; }; -std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index) + +std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds) { /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */ std::string result; - if (!ServerInstance->Config->ConfValue(*this->data, tag, name, index, result)) + if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds)) { this->error = CONF_VALUE_NOT_FOUND; - return ""; } - return result; } +std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds) +{ + return ReadValue(tag, name, "", index, allow_linefeeds); +} + +bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index) +{ + return ServerInstance->Config->ConfValueBool(*this->data, tag, name, default_value, index); +} + bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index) { - return ServerInstance->Config->ConfValueBool(*this->data, tag, name, index); + return ReadFlag(tag, name, "", index); } -long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned) + +long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool needs_unsigned) { int result; - if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, index, result)) + if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result)) { this->error = CONF_VALUE_NOT_FOUND; return 0; @@ -631,6 +640,11 @@ long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, return result; } +long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned) +{ + return ReadInteger(tag, name, "", index, needs_unsigned); +} + long ConfigReader::GetError() { long olderr = this->error; @@ -640,46 +654,7 @@ long ConfigReader::GetError() void ConfigReader::DumpErrors(bool bail, userrec* user) { - /* XXX - Duplicated code */ - - if (bail) - { - printf("There were errors in your configuration:\n%s", this->errorlog->str().c_str()); - InspIRCd::Exit(ERROR); - } - else - { - std::string errors = this->errorlog->str(); - std::string::size_type start; - unsigned int prefixlen; - - start = 0; - /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */ - prefixlen = strlen(ServerInstance->Config->ServerName) + strlen(user->nick) + 11; - - if (user) - { - user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick); - - while(start < errors.length()) - { - user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str()); - start += 510 - prefixlen; - } - } - else - { - ServerInstance->WriteOpers("There were errors in the configuration file:"); - - while(start < errors.length()) - { - ServerInstance->WriteOpers(errors.substr(start, 360).c_str()); - start += 360; - } - } - - return; - } + ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user); } @@ -701,10 +676,7 @@ bool ConfigReader::Verify() FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance) { - file_cache c; - ServerInstance->Config->ReadFile(c,filename.c_str()); - this->fc = c; - this->CalcSize(); + LoadFile(filename); } FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance) @@ -738,9 +710,12 @@ void FileReader::CalcSize() void FileReader::LoadFile(const std::string &filename) { file_cache c; - ServerInstance->Config->ReadFile(c,filename.c_str()); - this->fc = c; - this->CalcSize(); + c.clear(); + if (ServerInstance->Config->ReadFile(c,filename.c_str())) + { + this->fc = c; + this->CalcSize(); + } }