X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=831ddcac59f68f1488bee0dfbb8426eac51aee55;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=e9ea965f93c52f10dd13554ef3c73582e035b6a0;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index e9ea965f9..831ddcac5 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -19,21 +19,20 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" -#include "message.h" -#include - -extern time_t TIME; +#include "configreader.h" +#include "inspircd.h" +#include "wildcard.h" -class ListData +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. */ @@ -50,13 +49,14 @@ class ListTimer : public InspTimer { private: - Server* Srv; char buffer[MAXBUF]; chanrec *chan; + InspIRCd* ServerInstance; + const std::string glob; public: - ListTimer(long interval, Server* Me) : InspTimer(interval,TIME), Srv(Me) + ListTimer(InspIRCd* Instance, long interval) : InspTimer(interval,Instance->Time()), ServerInstance(Instance) { } @@ -72,42 +72,46 @@ class ListTimer : public InspTimer /* * 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 it's more than total number of channels, 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()) + ListData* ld; + u->GetExt("safelist_cache", ld); + if ((size_t)ld->list_position > ServerInstance->chanlist.size()) { 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); + 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 */ long amount_sent = 0; do { - log(DEBUG,"Channel %ld",ld->list_position); + ServerInstance->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); + 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 (!match(chan->name, ld->glob.c_str())) + continue; if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user))) { - long users = usercount(chan); + long users = chan->GetUserCounter(); if (users) { - int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chanmodes(chan,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 + Srv->GetServerName().length(); - log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax); - WriteServ_NoFormat(u->fd,buffer); + amount_sent += counter + 4 + strlen(ServerInstance->Config->ServerName); + ServerInstance->Log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax); + u->WriteServ(std::string(buffer)); } } else @@ -117,7 +121,7 @@ class ListTimer : public InspTimer if (!ld->list_ended) { ld->list_ended = true; - WriteServ(u->fd,"323 %s :End of channel list.",u->nick); + u->WriteServ("323 %s :End of channel list.",u->nick); } } } @@ -128,23 +132,21 @@ class ListTimer : public InspTimer } } - ListTimer* MyTimer = new ListTimer(1,Srv); - Srv->AddTimer(MyTimer); + ListTimer* MyTimer = new ListTimer(ServerInstance,1); + ServerInstance->Timers->AddTimer(MyTimer); } }; class ModuleSafeList : public Module { private: - Server *Srv; + ListTimer* MyTimer; public: - ModuleSafeList(Server* Me) : Module::Module(Me) + ModuleSafeList(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - - MyTimer = new ListTimer(1,Srv); - Srv->AddTimer(MyTimer); + MyTimer = new ListTimer(ServerInstance,1); + ServerInstance->Timers->AddTimer(MyTimer); } virtual ~ModuleSafeList() @@ -165,7 +167,7 @@ class ModuleSafeList : public Module * OnPreCommand() * Intercept the LIST command. */ - virtual int OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) + 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) @@ -182,10 +184,11 @@ class ModuleSafeList : public Module * 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) { @@ -193,29 +196,30 @@ class ModuleSafeList : public Module 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) + if (ServerInstance->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); + 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 = TIME; - user->Extend("safelist_last",(char*)llt); + *llt = ServerInstance->Time(); + user->Extend("safelist_last", llt); return 1; } @@ -225,11 +229,12 @@ class ModuleSafeList : public Module if(target_type == TYPE_USER) { userrec* u = (userrec*)item; - ListData* ld = (ListData*)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++) { @@ -240,10 +245,11 @@ class ModuleSafeList : public Module break; } } - time_t* last_list_time = (time_t*)u->GetExt("safelist_last"); + time_t* last_list_time; + u->GetExt("safelist_last", last_list_time); if (last_list_time) { - delete last_list_time; + DELETE(last_list_time); u->Shrink("safelist_last"); } } @@ -260,11 +266,8 @@ class ModuleSafeList : public Module } }; - - - -/******************************************************************************************************/ - + + class ModuleSafeListFactory : public ModuleFactory { public: @@ -276,7 +279,7 @@ class ModuleSafeListFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleSafeList(Me); }