* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-
-using namespace std;
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
-#include <vector>
#include "configreader.h"
#include "inspircd.h"
+#include "wildcard.h"
+/** Holds a users m_safelist state
+ */
class ListData : public classbase
{
public:
long list_start;
long list_position;
bool list_ended;
+ const std::string glob;
ListData() : list_start(0), list_position(0), list_ended(false) {};
- ListData(long pos, time_t t) : list_start(t), list_position(pos), list_ended(false) {};
+ ListData(long pos, time_t t, const std::string &pattern) : list_start(t), list_position(pos), list_ended(false), glob(pattern) {};
};
/* $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 ListTimer *timer;
-/*
- * To create a timer which recurs every second, we inherit from InspTimer.
+/** 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 :)
*/
char buffer[MAXBUF];
chanrec *chan;
InspIRCd* ServerInstance;
+ const std::string glob;
+ size_t ServerNameSize;
public:
ListTimer(InspIRCd* Instance, long interval) : InspTimer(interval,Instance->Time()), ServerInstance(Instance)
{
+ ServerNameSize = 4 + strlen(ServerInstance->Config->ServerName);
}
virtual void Tick(time_t TIME)
userrec* u = (userrec*)(*iter);
ListData* ld;
u->GetExt("safelist_cache", ld);
- if ((size_t)ld->list_position > ServerInstance->chanlist.size())
+ if ((size_t)ld->list_position > ServerInstance->chanlist->size())
{
u->Shrink("safelist_cache");
DELETE(ld);
break;
}
- log(DEBUG, "m_safelist.so: resuming spool of list to client %s at channel %ld", u->nick, ld->list_position);
+ ServerInstance->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 */
+ /* Attempt to fill up to 25% the user's sendq with /LIST output */
long amount_sent = 0;
do
{
- log(DEBUG,"Channel %ld",ld->list_position);
+ ServerInstance->Log(DEBUG,"Channel %ld",ld->list_position);
if (!ld->list_position)
u->WriteServ("321 %s Channel :Users Name",u->nick);
chan = ServerInstance->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)))
+ if ((chan) && (chan->modes[CM_PRIVATE]))
+ {
+ bool display = match(chan->name, ld->glob.c_str());
+ long users = chan->GetUserCounter();
+ if ((users) && (display))
+ {
+ int counter = snprintf(buffer, MAXBUF, "322 %s *", u->nick);
+ amount_sent += counter + ServerNameSize;
+ ServerInstance->Log(DEBUG, "m_safelist.so: Sent %ld of safe %ld / 4", amount_sent, u->sendqmax);
+ u->WriteServ(std::string(buffer));
+ }
+ }
+ 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();
- if (users)
+
+ if ((users) && (display))
{
- int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chan->ChanModes(has_user),chan->topic);
+ 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 + strlen(ServerInstance->Config->ServerName);
- log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax);
+ amount_sent += counter + ServerNameSize;
+ ServerInstance->Log(DEBUG, "m_safelist.so: Sent %ld of safe %ld / 4", amount_sent, u->sendqmax);
u->WriteServ(std::string(buffer));
}
}
}
}
- ListTimer* MyTimer = new ListTimer(ServerInstance,1);
- ServerInstance->Timers->AddTimer(MyTimer);
+ if (listusers.size())
+ {
+ timer = new ListTimer(ServerInstance,1);
+ ServerInstance->Timers->AddTimer(timer);
+ }
+ else
+ {
+ timer = NULL;
+ }
}
};
class ModuleSafeList : public Module
{
- private:
-
- ListTimer* MyTimer;
public:
ModuleSafeList(InspIRCd* Me) : Module::Module(Me)
{
- MyTimer = new ListTimer(ServerInstance,1);
- ServerInstance->Timers->AddTimer(MyTimer);
+ timer = NULL;
}
virtual ~ModuleSafeList()
{
+ if (timer)
+ ServerInstance->Timers->DelTimer(timer);
}
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_VENDOR);
+ return Version(1,1,0,0,VF_VENDOR,API_VERSION);
}
void Implements(char* List)
* OnPreCommand()
* Intercept the LIST command.
*/
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+ virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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)
return 1;
}
+ /* Work around mIRC suckyness. YOU SUCK, KHALED! */
+ if ((pcnt == 1) && (*parameters[0] == '<'))
+ pcnt = 0;
+
time_t* last_list_time;
user->GetExt("safelist_last", last_list_time);
if (last_list_time)
if (ServerInstance->Time() < (*last_list_time)+60)
{
user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick);
+ user->WriteServ("321 %s Channel :Users Name",user->nick);
+ user->WriteServ("323 %s :End of channel list.",user->nick);
return 1;
}
/*
* start at channel 0! ;)
*/
- ld = new ListData(0,ServerInstance->Time());
+ ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*");
user->Extend("safelist_cache", ld);
listusers.push_back(user);
time_t* llt = new time_t;
*llt = ServerInstance->Time();
user->Extend("safelist_last", llt);
-
+
+ if (!timer)
+ {
+ timer = new ListTimer(ServerInstance,1);
+ ServerInstance->Timers->AddTimer(timer);
+ }
+
return 1;
}
}
};
-
-
-
-/******************************************************************************************************/
-
+
+
class ModuleSafeListFactory : public ModuleFactory
{
public:
projects / user / henk / code / inspircd.git / blobdiff