X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=944d27741dc08cff0b8dcf5018dacd64325e7dfb;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=18b2bf6184a186e25b0a9e1db8b8b718393ddbdf;hpb=047f09dd572b89223ff3798dc25c34fe4c4172b3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 18b2bf618..944d27741 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -11,6 +11,7 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include "configreader.h" #include "users.h" #include "modules.h" @@ -21,7 +22,6 @@ #include "socketengine.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, int api_ver) @@ -41,7 +41,7 @@ Request::Request(char* anydata, Module* src, Module* dst) Request::Request(Module* src, Module* dst, const char* idstr) : id(idstr), source(src), dest(dst) { -}; +} char* Request::GetData() { @@ -75,7 +75,7 @@ char* Request::Send() } } -Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { }; +Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { } char* Event::GetData() { @@ -104,94 +104,95 @@ std::string Event::GetEventID() Module::Module(InspIRCd* Me) : ServerInstance(Me) { } Module::~Module() { } void Module::OnUserConnect(userrec* user) { } -void Module::OnUserQuit(userrec* user, const std::string& message) { } +void Module::OnUserQuit(userrec* user, const std::string& message, const std::string &oper_message) { } void Module::OnUserDisconnect(userrec* user) { } -void Module::OnUserJoin(userrec* user, chanrec* channel) { } +void Module::OnUserJoin(userrec* user, chanrec* channel, bool &silent) { } 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::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { } +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, std::string &privs) { return 0; } -void Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { }; +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,-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, 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; }; -void Module::On005Numeric(std::string &output) { }; -int Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { return 0; }; -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, 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; }; -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::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; }; -int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; }; -int Module::OnStats(char symbol, userrec* user, string_list &results) { return 0; }; -int Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; }; -int Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; }; -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, int tagnumber) { return 0; }; -void Module::OnGlobalOper(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, 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) { }; -void Module::OnGetServerDescription(const std::string &servername,std::string &description) { }; -void Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { }; -void Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { }; -void Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { }; -void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname) { }; -void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname) { }; -void Module::OnSyncOtherMetaData(Module* proto, void* opaque) { }; -void Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { }; -void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { }; -void Module::OnWallops(userrec* user, const std::string &text) { }; -void Module::OnChangeHost(userrec* user, const std::string &newhost) { }; -void Module::OnChangeName(userrec* user, const std::string &gecos) { }; -void Module::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { }; -void Module::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { }; -void Module::OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { }; -void Module::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { }; -void Module::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { }; -void Module::OnDelGLine(userrec* source, const std::string &hostmask) { }; -void Module::OnDelZLine(userrec* source, const std::string &ipmask) { }; -void Module::OnDelKLine(userrec* source, const std::string &hostmask) { }; -void Module::OnDelQLine(userrec* source, const std::string &nickmask) { }; -void Module::OnDelELine(userrec* source, const std::string &hostmask) { }; -void Module::OnCleanup(int target_type, void* item) { }; -void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; }; -void Module::OnChannelDelete(chanrec* chan) { }; +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, 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; } +void Module::On005Numeric(std::string &output) { } +int Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { return 0; } +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, 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; } +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, bool &silent) { } +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; } +int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; } +int Module::OnStats(char symbol, userrec* user, string_list &results) { return 0; } +int Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; } +int Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; } +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, int tagnumber) { return 0; } +void Module::OnGlobalOper(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, 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) { } +void Module::OnGetServerDescription(const std::string &servername,std::string &description) { } +void Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { } +void Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { } +void Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { } +void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { } +void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { } +void Module::OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) { } +void Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { } +void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { } +void Module::OnWallops(userrec* user, const std::string &text) { } +void Module::OnChangeHost(userrec* user, const std::string &newhost) { } +void Module::OnChangeName(userrec* user, const std::string &gecos) { } +void Module::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { } +void Module::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { } +void Module::OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { } +void Module::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { } +void Module::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { } +void Module::OnDelGLine(userrec* source, const std::string &hostmask) { } +void Module::OnDelZLine(userrec* source, const std::string &ipmask) { } +void Module::OnDelKLine(userrec* source, const std::string &hostmask) { } +void Module::OnDelQLine(userrec* source, const std::string &nickmask) { } +void Module::OnDelELine(userrec* source, const std::string &hostmask) { } +void Module::OnCleanup(int target_type, void* item) { } +void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; } +void Module::OnChannelDelete(chanrec* chan) { } Priority Module::Prioritize() { return PRIORITY_DONTCARE; } -void Module::OnSetAway(userrec* user) { }; -void Module::OnCancelAway(userrec* user) { }; -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() { }; +void Module::OnSetAway(userrec* user) { } +void Module::OnCancelAway(userrec* user) { } +int Module::OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist) { 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() { } +void Module::OnBufferFlushed(userrec* user) { } long InspIRCd::PriorityAfter(const std::string &modulename) { @@ -328,7 +329,7 @@ std::pair InspIRCd::GetInterfaceInstanceCount(Module* m) const std::string& InspIRCd::GetModuleName(Module* m) { - static std::string nothing = ""; /* Prevent compiler warning */ + static std::string nothing; /* Prevent compiler warning */ if (!this->GetModuleCount()) return nothing; @@ -348,6 +349,8 @@ void InspIRCd::RehashServer() this->WriteOpers("*** Rehashing config file"); this->RehashUsersAndChans(); this->Config->Read(false,NULL); + this->ResetMaxBans(); + this->Res->Rehash(); } /* This is ugly, yes, but hash_map's arent designed to be @@ -373,7 +376,7 @@ bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spatter return match(sliteral.c_str(),spattern.c_str()); } -bool InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user) +CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user) { return this->Parser->CallHandler(commandname,parameters,pcnt,user); } @@ -400,7 +403,7 @@ void InspIRCd::SendMode(const char** parameters, int pcnt, userrec *user) void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream) { std::string CompleteLine = LinePrefix; - std::string Word = ""; + std::string Word; while (TextStream >> Word) { if (CompleteLine.length() + Word.length() + 3 > 500) @@ -433,63 +436,16 @@ 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); -} - -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; -} - -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 (UCListIter i = zombie->chans.begin(); i != zombie->chans.end(); i++) + if (!cached) + return this->Res->AddResolverClass(r); + else { - chanrec* Ptr = i->first; - 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); + r->TriggerCachedResult(); + delete r; + return true; } - if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->GetFd() != FD_MAGIC_NUMBER)) - local_users.push_back(zombie); - return true; } void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask) @@ -623,7 +579,7 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog); if (!this->readerror) this->error = CONF_FILE_NOT_FOUND; -}; +} std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds) @@ -643,16 +599,22 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n 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; @@ -667,6 +629,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; @@ -698,10 +665,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) @@ -710,7 +674,7 @@ FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance) std::string FileReader::Contents() { - std::string x = ""; + std::string x; for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++) { x.append(*a); @@ -735,9 +699,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(); + } }