X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=b04701f5d9339c1a26f40b7aa7474fa37eb97955;hb=94afde43b086f092bf8128d76d418cb63840e8eb;hp=11bfe6721c8135e8e1326682080a9944eb68a9b6;hpb=29771d3c4fd397dbdea891706996541419852c14;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 11bfe6721..b04701f5d 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -10,11 +10,7 @@ * * --------------------------------------------------- */ - -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" + #include "inspircd.h" #include "wildcard.h" @@ -27,9 +23,11 @@ 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. */ @@ -41,16 +39,18 @@ class ModuleSafeList : public Module int global_listing; int LimitList; public: - ModuleSafeList(InspIRCd* Me) : Module::Module(Me) + ModuleSafeList(InspIRCd* Me) : Module(Me) { OnRehash(NULL, ""); + Implementation eventlist[] = { I_OnBufferFlushed, I_OnPreCommand, I_OnCleanup, I_OnUserQuit, I_On005Numeric, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 6); } virtual ~ModuleSafeList() { } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader MyConf(ServerInstance); ThrottleSecs = MyConf.ReadInteger("safelist", "throttle", "60", 0, true); @@ -64,16 +64,12 @@ class ModuleSafeList : public Module return Version(1,1,0,0,VF_VENDOR,API_VERSION); } - void Implements(char* List) - { - List[I_OnBufferFlushed] = List[I_OnPreCommand] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnRehash] = 1; - } /* * OnPreCommand() * Intercept the LIST command. */ - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { /* If the command doesnt appear to be valid, we dont want to mess with it. */ if (!validated) @@ -90,9 +86,11 @@ class ModuleSafeList : public Module * HandleList() * Handle (override) the LIST command. */ - int HandleList(const char** parameters, int pcnt, userrec* user) + int HandleList(const char** parameters, int pcnt, User* user) { - if (global_listing >= LimitList) + 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); @@ -111,8 +109,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); @@ -126,7 +137,7 @@ class ModuleSafeList : public Module return 1; } - DELETE(last_list_time); + delete last_list_time; user->Shrink("safelist_last"); } @@ -134,7 +145,7 @@ class ModuleSafeList : public Module /* * 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); time_t* llt = new time_t; @@ -148,22 +159,32 @@ class ModuleSafeList : public Module return 1; } - virtual void OnBufferFlushed(userrec* user) + virtual void OnBufferFlushed(User* user) { char buffer[MAXBUF]; ListData* ld; if (user->GetExt("safelist_cache", ld)) { - chanrec* chan = NULL; - long amount_sent = 0; + Channel* chan = NULL; + unsigned 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()); - long users = chan->GetUserCounter(); + 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); @@ -173,8 +194,7 @@ class ModuleSafeList : public Module } 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(); + 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); @@ -195,11 +215,11 @@ class ModuleSafeList : public Module } ld->list_position++; } - while ((chan != NULL) && (amount_sent < (user->sendqmax / 4))); + while ((chan != NULL) && (amount_sent < (user->MyClass->GetSendqMax() / 4))); if (ld->list_ended) { user->Shrink("safelist_cache"); - DELETE(ld); + delete ld; global_listing--; } } @@ -209,20 +229,20 @@ class ModuleSafeList : public Module { if(target_type == TYPE_USER) { - userrec* u = (userrec*)item; + User* u = (User*)item; ListData* ld; u->GetExt("safelist_cache", ld); if (ld) { u->Shrink("safelist_cache"); - DELETE(ld); + 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"); } } @@ -233,33 +253,11 @@ class ModuleSafeList : public Module output.append(" SAFELIST"); } - virtual void OnUserQuit(userrec* user, const std::string &message) + virtual void OnUserQuit(User* 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)