* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 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 */
+
#include "inspircd.h"
#include "cull_list.h"
-CullItem::CullItem(User* u, std::string &r, const char* o_reason)
-{
- this->user = u;
- this->reason = r;
- this->silent = false;
- /* Seperate oper reason not set, use the user reason */
- if (*o_reason)
- this->oper_reason = o_reason;
- else
- this->oper_reason = r;
-}
-
-CullItem::CullItem(User* u, const char* r, const char* o_reason)
-{
- this->user = u;
- this->reason = r;
- this->silent = false;
- /* Seperate oper reason not set, use the user reason */
- if (*o_reason)
- this->oper_reason = o_reason;
- else
- this->oper_reason = r;
-}
-
-void CullItem::MakeSilent()
-{
- this->silent = true;
-}
-
-bool CullItem::IsSilent()
-{
- return this->silent;
-}
-
-CullItem::~CullItem()
-{
-}
-
-User* CullItem::GetUser()
-{
- return this->user;
-}
-
-std::string& CullItem::GetReason()
-{
- return this->reason;
-}
-
-std::string& CullItem::GetOperReason()
-{
- return this->oper_reason;
-}
-
CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
{
- list.clear();
- exempt.clear();
}
-void CullList::AddItem(User* user, std::string &reason, const char* o_reason)
+void CullList::AddItem(User* user)
{
- AddItem(user, reason.c_str(), o_reason);
-}
-
-
-void CullList::AddItem(User* user, const char* reason, const char* o_reason)
-{
- if (exempt.find(user) == exempt.end())
- {
- CullItem item(user, reason, o_reason);
- list.push_back(item);
- exempt[user] = user;
- }
+ list.push_back(user);
}
void CullList::MakeSilent(User* user)
{
- for (std::vector<CullItem>::iterator a = list.begin(); a != list.end(); ++a)
- {
- if (a->GetUser() == user)
- {
- a->MakeSilent();
- break;
- }
- }
+ user->quietquit = true;
return;
}
-int CullList::Apply()
+void CullList::Apply()
{
- int n = list.size();
- while (list.size())
+ for(std::vector<User *>::iterator a = list.begin(); a != list.end(); a++)
{
- std::vector<CullItem>::iterator a = list.begin();
-
- User *u = a->GetUser();
- user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
- std::map<User*, User*>::iterator exemptiter = exempt.find(u);
- const char* preset_reason = u->GetOperQuit();
- std::string reason = a->GetReason();
- std::string oper_reason = *preset_reason ? preset_reason : a->GetOperReason();
-
- 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 (IS_LOCAL(u))
{
- if (!a->IsSilent())
+ 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)) && (!a->IsSilent()))
+ 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());
- exempt.erase(exemptiter);
+ delete u;
}
- return n;
+ list.clear();
}