X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=0ba1f28a1d1b815c59ba2e79e7e3cdcd21c68e59;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=68534fb22ebb74f29d1680a39dbeb30d42a742b3;hpb=b06361b4ec5f2451c0b31a0a889781076b9b1358;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 68534fb22..0ba1f28a1 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -3,13 +3,13 @@ * +------------------------------------+ * * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * E-mail: + * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -39,59 +39,31 @@ class ListData /* $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 ModuleSafeList : public Module +/* + * 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: - Server *Srv; - UserList listusers; /* vector of people doing a /list */ + + Server* Srv; + char buffer[MAXBUF]; + chanrec *chan; + public: - ModuleSafeList(Server* Me) : Module::Module(Me) - { - Srv = Me; - } - - virtual ~ModuleSafeList() - { - } - - virtual Version GetVersion() - { - return Version(1,0,0,0,VF_VENDOR); - } - - void Implements(char* List) - { - List[I_OnPreCommand] = List[I_OnBackgroundTimer] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = 1; - } - /* - * OnPreCommand() - * Intercept the LIST command. - */ - virtual int OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated) + ListTimer(long interval, Server* Me) : InspTimer(interval,TIME), Srv(Me) { - /* If the command doesnt appear to be valid, we dont want to mess with it. */ - if (!validated) - return 0; - - if (command == "LIST") - { - return this->HandleList(parameters, pcnt, user); - } - return 0; } - - /* - * OnBackgroundTimer() - * Spool off safelist information to users currently doing /list. - */ - virtual void OnBackgroundTimer(time_t curtime) + + virtual void Tick(time_t TIME) { bool go_again = true; - chanrec *chan; - char buffer[MAXBUF]; - + while (go_again) { go_again = false; @@ -101,19 +73,19 @@ class ModuleSafeList : public Module * What we do here: * - Get where they are up to * - If it's > GetChannelCount, erase them from the iterator, set go_again to true - * - If not, spool the next 20 channels + * - If not, spool more channels */ userrec* u = (userrec*)(*iter); ListData* ld = (ListData*)u->GetExt("safelist_cache"); if (ld->list_position > Srv->GetChannelCount()) { u->Shrink("safelist_cache"); - delete ld; + DELETE(ld); listusers.erase(iter); go_again = true; break; } - + log(DEBUG, "m_safelist.so: resuming spool of list to client %s at channel %ld", u->nick, ld->list_position); chan = NULL; /* Attempt to fill up to half the user's sendq with /LIST output */ @@ -121,32 +93,91 @@ class ModuleSafeList : public Module do { log(DEBUG,"Channel %ld",ld->list_position); + if (!ld->list_position) + WriteServ(u->fd,"321 %s Channel :Users Name",u->nick); chan = Srv->GetChannelIndex(ld->list_position); /* spool details */ - if (chan) + bool has_user = (chan && chan->HasUser(u)); + if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user))) { - /* Increment total plus linefeed */ - int counter = snprintf(buffer,MAXBUF,"322 %s %s %d :[+%s] %s",u->nick,chan->name,usercount_i(chan),chanmodes(chan,has_channel(u,chan)),chan->topic); - amount_sent += counter + 4 + Srv->GetServerName().length(); - log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 2",amount_sent,u->sendqmax); - WriteServ(u->fd,"%s",buffer); + long users = usercount(chan); + if (users) + { + int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chanmodes(chan,has_user),chan->topic); + /* Increment total plus linefeed */ + amount_sent += counter + 4 + Srv->GetServerName().length(); + log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax); + WriteServ_NoFormat(u->fd,buffer); + } } else { - if (!ld->list_ended) + if (!chan) { - ld->list_ended = true; - WriteServ(u->fd,"323 %s :End of channel list.",u->nick); + if (!ld->list_ended) + { + ld->list_ended = true; + WriteServ(u->fd,"323 %s :End of channel list.",u->nick); + } } } ld->list_position++; } - while ((chan != NULL) && (amount_sent < (u->sendqmax / 2))); + while ((chan != NULL) && (amount_sent < (u->sendqmax / 4))); } } + + ListTimer* MyTimer = new ListTimer(1,Srv); + Srv->AddTimer(MyTimer); + } +}; + +class ModuleSafeList : public Module +{ + private: + Server *Srv; + ListTimer* MyTimer; + public: + ModuleSafeList(Server* Me) : Module::Module(Me) + { + Srv = Me; + + MyTimer = new ListTimer(1,Srv); + Srv->AddTimer(MyTimer); } + virtual ~ModuleSafeList() + { + } + + virtual Version GetVersion() + { + return Version(1,0,0,0,VF_VENDOR); + } + + void Implements(char* List) + { + List[I_OnPreCommand] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = 1; + } + + /* + * OnPreCommand() + * Intercept the LIST command. + */ + virtual int OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) + { + /* If the command doesnt appear to be valid, we dont want to mess with it. */ + if (!validated) + return 0; + + if (command == "LIST") + { + return this->HandleList(parameters, pcnt, user); + } + return 0; + } + /* * HandleList() * Handle (override) the LIST command. @@ -171,7 +202,7 @@ class ModuleSafeList : public Module return 1; } - delete last_list_time; + DELETE(last_list_time); user->Shrink("safelist_last"); } @@ -185,26 +216,20 @@ class ModuleSafeList : public Module time_t* llt = new time_t; *llt = TIME; user->Extend("safelist_last",(char*)llt); - - WriteServ(user->fd,"321 %s Channel :Users Name",user->nick); - /* - * If we can, we try and fill up the user's sendq right now with the first batch of channels, - * which on a small net, may be ALL of them. - */ - this->OnBackgroundTimer(TIME); + return 1; } - virtual void OnCleanup(int target_type, void* item) - { - if(target_type == TYPE_USER) + virtual void OnCleanup(int target_type, void* item) + { + if(target_type == TYPE_USER) { userrec* u = (userrec*)item; ListData* ld = (ListData*)u->GetExt("safelist_cache"); if (ld) { u->Shrink("safelist_cache"); - delete ld; + DELETE(ld); } for (UserList::iterator iter = listusers.begin(); iter != listusers.end(); iter++) { @@ -218,7 +243,7 @@ class ModuleSafeList : public Module time_t* last_list_time = (time_t*)u->GetExt("safelist_last"); if (last_list_time) { - delete last_list_time; + DELETE(last_list_time); u->Shrink("safelist_last"); } } @@ -229,7 +254,7 @@ class ModuleSafeList : public Module output.append(" SAFELIST"); } - virtual void OnUserQuit(userrec* user, std::string message) + virtual void OnUserQuit(userrec* user, const std::string &message) { this->OnCleanup(TYPE_USER,user); }