* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
* ---------------------------------------------------
*/
-/* $Core: libIRCDcull_list */
+/* $Core */
#include "inspircd.h"
#include "cull_list.h"
CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
{
- list.clear();
}
void CullList::AddItem(User* user)
{
- if (user->quitting)
- {
- ServerInstance->Log(DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick);
- return;
- }
-
- user->quitting = true;
list.push_back(user);
}
return;
}
-int CullList::Apply()
+void CullList::Apply()
{
- int n = list.size();
- int i = 0;
-
- while (list.size() && i++ != 100)
+ for(std::vector<User *>::iterator a = list.begin(); a != list.end(); a++)
{
- std::vector<User *>::iterator a = list.begin();
-
- User *u = (*a);
- user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
- const char* preset_reason = u->GetOperQuit();
- std::string reason = u->operquitmsg;
- std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
-
- if (reason.length() > MAXQUIT - 1)
- reason.resize(MAXQUIT - 1);
- if (oper_reason.length() > MAXQUIT - 1)
- oper_reason.resize(MAXQUIT - 1);
+ User *u = *a;
+ // user has been moved onto their UID; that's why this isn't find(u->nick)
+ user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->uuid);
if (u->registered != REG_ALL)
- if (ServerInstance->unregistered_count)
- ServerInstance->unregistered_count--;
+ if (ServerInstance->Users->unregistered_count)
+ ServerInstance->Users->unregistered_count--;
if (IS_LOCAL(u))
{
- if ((!u->sendq.empty()) && (!(*u->GetWriteError())))
+ if (!u->sendq.empty())
u->FlushWriteBuf();
- }
-
- if (u->registered == REG_ALL)
- {
- FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(u, reason, oper_reason));
- u->PurgeEmptyChannels();
- u->WriteCommonQuit(reason, oper_reason);
- }
-
- FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(u));
- if (IS_LOCAL(u))
- {
- if (ServerInstance->Config->GetIOHook(u->GetPort()))
+ if (u->GetIOHook())
{
try
{
- ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd());
+ u->GetIOHook()->OnRawSocketClose(u->GetFd());
}
catch (CoreException& modexcept)
{
- ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
}
}
{
if (!u->quietquit)
{
- ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick,u->ident,u->host,oper_reason.c_str());
+ ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]", u->nick.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str());
}
}
else
{
if ((!ServerInstance->SilentULine(u->server)) && (!u->quietquit))
{
- ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",u->server,u->nick,u->ident,u->host,oper_reason.c_str());
+ ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]", u->server, u->nick.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str());
}
}
u->AddToWhoWas();
}
- if (iter != ServerInstance->clientlist->end())
+ if (iter != ServerInstance->Users->clientlist->end())
{
- if (IS_LOCAL(u))
+ ServerInstance->Users->clientlist->erase(iter);
+ }
+ else
+ {
+ ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
+ }
+
+ if (IS_LOCAL(u))
+ {
+ std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
+ if (x != ServerInstance->Users->local_users.end())
+ ServerInstance->Users->local_users.erase(x);
+ else
{
- std::vector<User*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),u);
- if (x != ServerInstance->local_users.end())
- ServerInstance->local_users.erase(x);
+ ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector..");
}
- ServerInstance->clientlist->erase(iter);
}
delete u;
- list.erase(list.begin());
}
-
- return n;
+ list.clear();
}