* ---------------------------------------------------
*/
-/* $Core: libIRCDcull_list */
+/* $Core */
#include "inspircd.h"
#include "cull_list.h"
std::string reason;
std::string oper_reason;
- reason.assign(u->quitmsg, 0, MAXQUIT - 1);
- oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, 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 (u->registered != REG_ALL)
if (ServerInstance->Users->unregistered_count)
if (IS_LOCAL(u))
{
- if ((!u->sendq.empty()) && (!(*u->GetWriteError())))
+ if (!u->sendq.empty())
u->FlushWriteBuf();
}
if (IS_LOCAL(u))
{
- if (u->io)
+ if (u->GetIOHook())
{
try
{
- u->io->OnRawSocketClose(u->GetFd());
+ u->GetIOHook()->OnRawSocketClose(u->GetFd());
}
catch (CoreException& modexcept)
{
{
if (!u->quietquit)
{
- ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick.c_str(),u->ident.c_str(),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(), oper_reason.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.c_str(),u->ident.c_str(),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(), oper_reason.c_str());
}
}
u->AddToWhoWas();
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->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
- if (x != ServerInstance->Users->local_users.end())
- ServerInstance->Users->local_users.erase(x);
+ ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector..");
}
- ServerInstance->Users->clientlist->erase(iter);
}
delete u;