X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=0ba1f28a1d1b815c59ba2e79e7e3cdcd21c68e59;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=06c7ef34806bd9b1042dbe6e02978df5829a0ad6;hpb=aca9acf422c76fefa4223f3add27e62e860f2f62;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 06c7ef348..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,19 +39,95 @@ 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 */ +/* + * 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; + char buffer[MAXBUF]; + chanrec *chan; + public: - ListTimer(long interval, Server* Me) : InspTimer(interval), Srv(Me) + + ListTimer(long interval, Server* Me) : InspTimer(interval,TIME), Srv(Me) { } virtual void Tick(time_t TIME) { - log(DEBUG,"*** Timer tick!"); + 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 > GetChannelCount, erase them from the iterator, set go_again to true + * - 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); + 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 */ + long amount_sent = 0; + 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 */ + bool has_user = (chan && chan->HasUser(u)); + if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user))) + { + 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 (!chan) + { + 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 / 4))); + } + } + ListTimer* MyTimer = new ListTimer(1,Srv); Srv->AddTimer(MyTimer); } @@ -62,7 +138,6 @@ class ModuleSafeList : public Module private: Server *Srv; ListTimer* MyTimer; - UserList listusers; /* vector of people doing a /list */ public: ModuleSafeList(Server* Me) : Module::Module(Me) { @@ -83,14 +158,14 @@ class ModuleSafeList : public Module void Implements(char* List) { - List[I_OnPreCommand] = List[I_OnBackgroundTimer] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = 1; + List[I_OnPreCommand] = 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) + 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) @@ -103,71 +178,6 @@ class ModuleSafeList : public Module return 0; } - /* - * OnBackgroundTimer() - * Spool off safelist information to users currently doing /list. - */ - virtual void OnBackgroundTimer(time_t curtime) - { - bool go_again = true; - chanrec *chan; - char buffer[MAXBUF]; - - 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 > GetChannelCount, erase them from the iterator, set go_again to true - * - If not, spool the next 20 channels - */ - userrec* u = (userrec*)(*iter); - ListData* ld = (ListData*)u->GetExt("safelist_cache"); - if (ld->list_position > Srv->GetChannelCount()) - { - u->Shrink("safelist_cache"); - 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 */ - long amount_sent = 0; - do - { - log(DEBUG,"Channel %ld",ld->list_position); - chan = Srv->GetChannelIndex(ld->list_position); - /* spool details */ - if (chan) - { - /* 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_NoFormat(u->fd,buffer); - } - else - { - 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))); - } - } - } - /* * HandleList() * Handle (override) the LIST command. @@ -192,7 +202,7 @@ class ModuleSafeList : public Module return 1; } - delete last_list_time; + DELETE(last_list_time); user->Shrink("safelist_last"); } @@ -206,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++) { @@ -239,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"); } } @@ -250,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); }