* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
+/* $Core: libIRCDcull_list */
+
#include "inspircd.h"
-#include "users.h"
#include "cull_list.h"
-CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
-{
- this->user = u;
- this->reason = r;
- /* Seperate oper reason not set, use the user reason */
- if (*o_reason)
- this->oper_reason = o_reason;
- else
- this->oper_reason = r;
-}
-
-CullItem::CullItem(userrec* u, const char* r, const char* o_reason)
-{
- this->user = u;
- this->reason = r;
- /* Seperate oper reason not set, use the user reason */
- if (*o_reason)
- this->oper_reason = o_reason;
- else
- this->oper_reason = r;
-}
-
-CullItem::~CullItem()
-{
-}
-
-userrec* 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(userrec* user, std::string &reason, const char* o_reason)
+void CullList::AddItem(User* user)
{
- AddItem(user, reason.c_str(), o_reason);
-}
+ if (user->quitting)
+ {
+ ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
+ return;
+ }
+ user->quitting = true;
+ list.push_back(user);
+}
-void CullList::AddItem(userrec* user, const char* reason, const char* o_reason)
+void CullList::MakeSilent(User* user)
{
- if (exempt.find(user) == exempt.end())
- {
- CullItem item(user, reason, o_reason);
- list.push_back(item);
- exempt[user] = user;
- }
+ user->quietquit = true;
+ return;
}
int CullList::Apply()
{
int n = list.size();
- while (list.size())
+ int i = 0;
+
+ while (list.size() && i++ != 100)
{
- std::vector<CullItem>::iterator a = list.begin();
+ std::vector<User *>::iterator a = list.begin();
- user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick);
- std::map<userrec*, userrec*>::iterator exemptiter = exempt.find(a->GetUser());
- std::string reason = a->GetReason();
- std::string oper_reason = a->GetOperReason();
+ User *u = (*a);
+ user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
+ const std::string& preset_reason = u->GetOperQuit();
+ std::string reason;
+ std::string oper_reason;
- if (reason.length() > MAXQUIT - 1)
- reason.resize(MAXQUIT - 1);
- if (oper_reason.length() > MAXQUIT - 1)
- oper_reason.resize(MAXQUIT - 1);
+ reason.assign(u->quitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
+ oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
- if (a->GetUser()->registered != REG_ALL)
- if (ServerInstance->unregistered_count)
- ServerInstance->unregistered_count--;
+ if (u->registered != REG_ALL)
+ if (ServerInstance->Users->unregistered_count)
+ ServerInstance->Users->unregistered_count--;
- if (IS_LOCAL(a->GetUser()))
+ if (IS_LOCAL(u))
{
- a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]",a->GetUser()->ident,a->GetUser()->host,reason.c_str());
- if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError())))
- a->GetUser()->FlushWriteBuf();
+ if (!u->sendq.empty())
+ u->FlushWriteBuf();
}
- if (a->GetUser()->registered == REG_ALL)
+ if (u->registered == REG_ALL)
{
- a->GetUser()->PurgeEmptyChannels();
- a->GetUser()->WriteCommonQuit(reason, oper_reason);
- FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(),reason));
+ 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(a->GetUser()));
+ FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(u));
- if (IS_LOCAL(a->GetUser()))
+ if (IS_LOCAL(u))
{
- if (ServerInstance->Config->GetIOHook(a->GetUser()->GetPort()))
+ if (u->io)
{
try
{
- ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())->OnRawSocketClose(a->GetUser()->GetFd());
+ u->io->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());
}
}
- ServerInstance->SE->DelFd(a->GetUser());
- a->GetUser()->CloseSocket();
+ ServerInstance->SE->DelFd(u);
+ u->CloseSocket();
}
/*
* this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
* if they were an oper with +sn +qQ.
*/
- if (a->GetUser()->registered == REG_ALL)
+ if (u->registered == REG_ALL)
{
- if (IS_LOCAL(a->GetUser()))
- ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+ if (IS_LOCAL(u))
+ {
+ if (!u->quietquit)
+ {
+ ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]", u->nick.c_str(), u->ident.c_str(), u->host.c_str(), oper_reason.c_str());
+ }
+ }
else
- ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
- a->GetUser()->AddToWhoWas();
+ {
+ if ((!ServerInstance->SilentULine(u->server)) && (!u->quietquit))
+ {
+ 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(), oper_reason.c_str());
+ }
+ }
+ u->AddToWhoWas();
+ }
+
+ if (iter != ServerInstance->Users->clientlist->end())
+ {
+ ServerInstance->Users->clientlist->erase(iter);
+ }
+ else
+ {
+ ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
}
- if (iter != ServerInstance->clientlist->end())
+ if (IS_LOCAL(u))
{
- if (IS_LOCAL(a->GetUser()))
+ 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<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser());
- 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(a->GetUser());
}
+ delete u;
list.erase(list.begin());
- exempt.erase(exemptiter);
}
+
return n;
}
+
projects / user / henk / code / inspircd.git / blobdiff