* +------------------------------------+
*
* InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
*
* 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.
*
* ---------------------------------------------------
*/
#include "helperfuncs.h"
#include "message.h"
#include <vector>
-
+#include "inspircd.h"
+
extern time_t TIME;
-class ListData
+extern InspIRCd* ServerInstance;
+
+class ListData : public classbase
{
public:
long list_start;
/* $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 */
-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] = 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;
* 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");
+ ListData* ld;
+ u->GetExt("safelist_cache", ld);
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 */
do
{
log(DEBUG,"Channel %ld",ld->list_position);
+ if (!ld->list_position)
+ u->WriteServ("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 + 2;
- log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 2",amount_sent,u->sendqmax);
- WriteServ(u->fd,"%s",buffer);
+ long users = chan->GetUserCounter();
+ if (users)
+ {
+ 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 + 4 + Srv->GetServerName().length();
+ log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax);
+ u->WriteServ(std::string(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;
+ u->WriteServ("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);
+ ServerInstance->Timers->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);
+ ServerInstance->Timers->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, const 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.
*/
- int HandleList(char** parameters, int pcnt, userrec* user)
+ int HandleList(const char** parameters, int pcnt, userrec* user)
{
/* First, let's check if the user is currently /list'ing */
- ListData *ld = (ListData*)user->GetExt("safelist_cache");
+ ListData *ld;
+ user->GetExt("safelist_cache", ld);
if (ld)
{
return 1;
}
- time_t* last_list_time = (time_t*)user->GetExt("safelist_last");
+ time_t* last_list_time;
+ user->GetExt("safelist_last", last_list_time);
if (last_list_time)
{
if (TIME < (*last_list_time)+60)
{
- WriteServ(user->fd,"NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick);
+ user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick);
return 1;
}
- delete last_list_time;
+ DELETE(last_list_time);
user->Shrink("safelist_last");
}
* start at channel 0! ;)
*/
ld = new ListData(0,TIME);
- user->Extend("safelist_cache", (char*)ld);
+ user->Extend("safelist_cache", ld);
listusers.push_back(user);
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);
+ user->Extend("safelist_last", llt);
+
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 = u->GetExt("safelist_cache");
+ ListData* ld;
+ u->GetExt("safelist_cache", ld);
if (ld)
{
u->Shrink("safelist_cache");
- delete ld;
+ DELETE(ld);
}
for (UserList::iterator iter = listusers.begin(); iter != listusers.end(); iter++)
{
break;
}
}
- time_t* last_list_time = (time_t*)user->GetExt("safelist_last");
+ time_t* last_list_time;
+ u->GetExt("safelist_last", last_list_time);
if (last_list_time)
{
- delete last_list_time;
- user->Shrink("safelist_last");
+ DELETE(last_list_time);
+ u->Shrink("safelist_last");
}
}
}
- virtual void OnUserQuit(userrec* user, std::string message)
+ virtual void On005Numeric(std::string &output)
+ {
+ output.append(" SAFELIST");
+ }
+
+ virtual void OnUserQuit(userrec* user, const std::string &message)
{
this->OnCleanup(TYPE_USER,user);
}
projects / user / henk / code / inspircd.git / blobdiff