X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=40b8d1b0f03f36bf402044d56951054751707868;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=10b8cc270ed7893d242387b27c362d58f06e5d61;hpb=50d65268f4af9caf5e990e6323607b30217d7c60;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 10b8cc270..40b8d1b0f 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -6,15 +6,11 @@ * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ - -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" + #include "inspircd.h" #include "wildcard.h" @@ -27,149 +23,38 @@ class ListData : public classbase long list_position; bool list_ended; const std::string glob; + int minusers; + int maxusers; ListData() : list_start(0), list_position(0), list_ended(false) {}; - ListData(long pos, time_t t, const std::string &pattern) : list_start(t), list_position(pos), list_ended(false), glob(pattern) {}; + ListData(long pos, time_t t, const std::string &pattern, int mi, int ma) : list_start(t), list_position(pos), list_ended(false), glob(pattern), minusers(mi), maxusers(ma) {}; }; /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */ - -typedef std::vector UserList; -UserList listusers; /* vector of people doing a /list */ -class ListTimer *timer; - -/** To create a timer which recurs every second, we inherit from InspTimer. - * InspTimer is only one-shot however, so at the end of each Tick() we simply - * insert another of ourselves into the pending queue :) - */ -class ListTimer : public InspTimer -{ - private: - - char buffer[MAXBUF]; - chanrec *chan; - InspIRCd* ServerInstance; - const std::string glob; - size_t ServerNameSize; - - public: - - ListTimer(InspIRCd* Instance, long interval) : InspTimer(interval,Instance->Time()), ServerInstance(Instance) - { - ServerNameSize = 4 + strlen(ServerInstance->Config->ServerName); - } - - virtual void Tick(time_t TIME) - { - bool go_again = true; - - while (go_again) - { - go_again = false; - for (UserList::iterator iter = listusers.begin(); iter != listusers.end(); iter++) - { - /* - * What we do here: - * - Get where they are up to - * - If it's more than total number of channels, erase - * them from the iterator, set go_again to true - * - If not, spool more channels - */ - userrec* u = (userrec*)(*iter); - ListData* ld; - u->GetExt("safelist_cache", ld); - if ((size_t)ld->list_position > ServerInstance->chanlist->size()) - { - u->Shrink("safelist_cache"); - DELETE(ld); - listusers.erase(iter); - go_again = true; - break; - } - chan = NULL; - /* Attempt to fill up to 25% the user's sendq with /LIST output */ - long amount_sent = 0; - do - { - if (!ld->list_position) - u->WriteServ("321 %s Channel :Users Name",u->nick); - chan = ServerInstance->GetChannelIndex(ld->list_position); - /* spool details */ - bool has_user = (chan && chan->HasUser(u)); - if ((chan) && (chan->modes[CM_PRIVATE])) - { - bool display = match(chan->name, ld->glob.c_str()); - long users = chan->GetUserCounter(); - if ((users) && (display)) - { - int counter = snprintf(buffer, MAXBUF, "322 %s *", u->nick); - amount_sent += counter + ServerNameSize; - u->WriteServ(std::string(buffer)); - } - } - else if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user))) - { - bool display = match(chan->name, ld->glob.c_str()); - long users = chan->GetUserCounter(); - - if ((users) && (display)) - { - int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",u->nick, chan->name, users, chan->ChanModes(has_user), chan->topic); - /* Increment total plus linefeed */ - amount_sent += counter + ServerNameSize; - u->WriteServ(std::string(buffer)); - } - } - else - { - if (!chan) - { - if (!ld->list_ended) - { - ld->list_ended = true; - u->WriteServ("323 %s :End of channel list.",u->nick); - } - } - } - - ld->list_position++; - } - while ((chan != NULL) && (amount_sent < (u->sendqmax / 4))); - } - } - - if (listusers.size()) - { - timer = new ListTimer(ServerInstance,1); - ServerInstance->Timers->AddTimer(timer); - } - else - { - timer = NULL; - } - } -}; class ModuleSafeList : public Module { - unsigned int ThrottleSecs; + time_t ThrottleSecs; + size_t ServerNameSize; + int global_listing; + int LimitList; public: - ModuleSafeList(InspIRCd* Me) : Module::Module(Me) + ModuleSafeList(InspIRCd* Me) : Module(Me) { - timer = NULL; OnRehash(NULL, ""); } virtual ~ModuleSafeList() { - if (timer) - ServerInstance->Timers->DelTimer(timer); } virtual void OnRehash(userrec* user, const std::string ¶meter) { ConfigReader MyConf(ServerInstance); ThrottleSecs = MyConf.ReadInteger("safelist", "throttle", "60", 0, true); + LimitList = MyConf.ReadInteger("safelist", "maxlisters", "50", 0, true); + ServerNameSize = strlen(ServerInstance->Config->ServerName) + 4; + global_listing = 0; } virtual Version GetVersion() @@ -179,7 +64,7 @@ class ModuleSafeList : public Module void Implements(char* List) { - List[I_OnPreCommand] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnRehash] = 1; + List[I_OnBufferFlushed] = List[I_OnPreCommand] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnRehash] = 1; } /* @@ -205,6 +90,16 @@ class ModuleSafeList : public Module */ int HandleList(const char** parameters, int pcnt, userrec* user) { + int minusers = 0, maxusers = 0; + + if (global_listing >= LimitList && !IS_OPER(user)) + { + user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick); + user->WriteServ("321 %s Channel :Users Name",user->nick); + user->WriteServ("323 %s :End of channel list.",user->nick); + return 1; + } + /* First, let's check if the user is currently /list'ing */ ListData *ld; user->GetExt("safelist_cache", ld); @@ -216,8 +111,21 @@ class ModuleSafeList : public Module } /* Work around mIRC suckyness. YOU SUCK, KHALED! */ - if ((pcnt == 1) && (*parameters[0] == '<')) - pcnt = 0; + if (pcnt == 1) + { + if (*parameters[0] == '<') + { + maxusers = atoi(parameters[0]+1); + ServerInstance->Log(DEBUG,"Max users: %d", maxusers); + pcnt = 0; + } + else if (*parameters[0] == '>') + { + minusers = atoi(parameters[0]+1); + ServerInstance->Log(DEBUG,"Min users: %d", minusers); + pcnt = 0; + } + } time_t* last_list_time; user->GetExt("safelist_last", last_list_time); @@ -231,30 +139,94 @@ class ModuleSafeList : public Module return 1; } - DELETE(last_list_time); + delete last_list_time; user->Shrink("safelist_last"); } + /* * start at channel 0! ;) */ - ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*"); + ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*", minusers, maxusers); user->Extend("safelist_cache", ld); - listusers.push_back(user); time_t* llt = new time_t; *llt = ServerInstance->Time(); user->Extend("safelist_last", llt); - if (!timer) - { - timer = new ListTimer(ServerInstance,1); - ServerInstance->Timers->AddTimer(timer); - } + user->WriteServ("321 %s Channel :Users Name",user->nick); + + global_listing++; return 1; } + virtual void OnBufferFlushed(userrec* user) + { + char buffer[MAXBUF]; + ListData* ld; + if (user->GetExt("safelist_cache", ld)) + { + chanrec* chan = NULL; + long amount_sent = 0; + do + { + chan = ServerInstance->GetChannelIndex(ld->list_position); + bool has_user = (chan && chan->HasUser(user)); + long users = chan ? chan->GetUserCounter() : 0; + + bool too_few = (ld->minusers && (users <= ld->minusers)); + bool too_many = (ld->maxusers && (users >= ld->maxusers)); + + if (chan && (too_many || too_few)) + { + ld->list_position++; + continue; + } + + if ((chan) && (chan->modes[CM_PRIVATE])) + { + bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str()))); + if ((users) && (display)) + { + int counter = snprintf(buffer, MAXBUF, "322 %s *", user->nick); + amount_sent += counter + ServerNameSize; + user->WriteServ(std::string(buffer)); + } + } + else if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user))) + { + bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str()))); + if ((users) && (display)) + { + int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick, chan->name, users, chan->ChanModes(has_user), chan->topic); + amount_sent += counter + ServerNameSize; + user->WriteServ(std::string(buffer)); + } + } + else + { + if (!chan) + { + if (!ld->list_ended) + { + ld->list_ended = true; + user->WriteServ("323 %s :End of channel list.",user->nick); + } + } + } + ld->list_position++; + } + while ((chan != NULL) && (amount_sent < (user->sendqmax / 4))); + if (ld->list_ended) + { + user->Shrink("safelist_cache"); + delete ld; + global_listing--; + } + } + } + virtual void OnCleanup(int target_type, void* item) { if(target_type == TYPE_USER) @@ -265,22 +237,14 @@ class ModuleSafeList : public Module if (ld) { u->Shrink("safelist_cache"); - DELETE(ld); - } - for (UserList::iterator iter = listusers.begin(); iter != listusers.end(); iter++) - { - userrec* u2 = (userrec*)(*iter); - if (u2 == u) - { - listusers.erase(iter); - break; - } + delete ld; + global_listing--; } time_t* last_list_time; u->GetExt("safelist_last", last_list_time); if (last_list_time) { - DELETE(last_list_time); + delete last_list_time; u->Shrink("safelist_last"); } } @@ -291,33 +255,11 @@ class ModuleSafeList : public Module output.append(" SAFELIST"); } - virtual void OnUserQuit(userrec* user, const std::string &message) + virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message) { this->OnCleanup(TYPE_USER,user); } }; - -class ModuleSafeListFactory : public ModuleFactory -{ - public: - ModuleSafeListFactory() - { - } - - ~ModuleSafeListFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSafeList(Me); - } - -}; - -extern "C" void * init_module( void ) -{ - return new ModuleSafeListFactory; -} +MODULE_INIT(ModuleSafeList)