/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
typedef std::vector<userrec *> 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,TIME), Srv(Me)
+ {
+ }
+
+ 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 > 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);
+ 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->binarymodes & CM_PRIVATE)) && (!(chan->binarymodes & CM_SECRET))) || (has_user)))
+ {
+ /* Increment total plus linefeed */
+ long users = usercount_i(chan);
+ /* If there are only invisible users on the channel, dont show it */
+ if (users)
+ {
+ int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chanmodes(chan,has_user),chan->topic);
+ 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);
+ }
+};
class ModuleSafeList : public Module
{
private:
Server *Srv;
- UserList listusers; /* vector of people doing a /list */
+ ListTimer* MyTimer;
public:
ModuleSafeList(Server* Me) : Module::Module(Me)
{
Srv = Me;
+
+ MyTimer = new ListTimer(1,Srv);
+ Srv->AddTimer(MyTimer);
}
virtual ~ModuleSafeList()
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)
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.
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;
}
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);
}
projects / user / henk / code / inspircd.git / blobdiff