X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcull_list.cpp;h=1ce6dfae104fff5a9988298b8c18a73d1287e789;hb=b43fc66c17c2bef6dca66a966676b8128d5774ee;hp=188c3a8e6b99ec61d4d8d725cff6863630830a2c;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 188c3a8e6..1ce6dfae1 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -2,8 +2,8 @@ * | 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. @@ -12,189 +12,47 @@ */ #include "inspircd.h" -#include "cull_list.h" +#include -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) +void CullList::Apply() { + std::set gone; + std::vector queue; + queue.reserve(list.size() + 32); + for(unsigned int i=0; i < list.size(); i++) + { + classbase* c = list[i]; + if (gone.insert(c).second) + { + ServerInstance->Logs->Log("CULLLIST", DEBUG, "Deleting %s @%p", typeid(*c).name(), + (void*)c); + c->cull(); + queue.push_back(c); + } + else + { + ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Object @%p culled twice!", + (void*)c); + } + } list.clear(); - exempt.clear(); -} - -void CullList::AddItem(User* user, std::string &reason, const char* o_reason) -{ - 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()) + for(unsigned int i=0; i < queue.size(); i++) { - CullItem item(user, reason, o_reason); - list.push_back(item); - exempt[user] = user; + classbase* c = queue[i]; + delete c; } -} - -void CullList::MakeSilent(User* user) -{ - for (std::vector::iterator a = list.begin(); a != list.end(); ++a) + if (list.size()) { - if (a->GetUser() == user) - { - a->MakeSilent(); - break; - } + ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Objects added to cull list in a destructor"); + Apply(); } - return; } -int CullList::Apply() +void ActionList::Run() { - int n = list.size(); - while (list.size()) + for(unsigned int i=0; i < list.size(); i++) { - std::vector::iterator a = list.begin(); - - user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick); - std::map::iterator exemptiter = exempt.find(a->GetUser()); - const char* preset_reason = a->GetUser()->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); - - if (a->GetUser()->registered != REG_ALL) - if (ServerInstance->unregistered_count) - ServerInstance->unregistered_count--; - - if (IS_LOCAL(a->GetUser())) - { - if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError()))) - a->GetUser()->FlushWriteBuf(); - } - - if (a->GetUser()->registered == REG_ALL) - { - FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(), reason, oper_reason)); - a->GetUser()->PurgeEmptyChannels(); - a->GetUser()->WriteCommonQuit(reason, oper_reason); - } - - FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser())); - - if (IS_LOCAL(a->GetUser())) - { - if (ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())) - { - try - { - ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())->OnRawSocketClose(a->GetUser()->GetFd()); - } - catch (CoreException& modexcept) - { - ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); - } - } - - ServerInstance->SE->DelFd(a->GetUser()); - a->GetUser()->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 (IS_LOCAL(a->GetUser())) - { - if (!a->IsSilent()) - { - ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str()); - } - } - else - { - if ((!ServerInstance->SilentULine(a->GetUser()->server)) && (!a->IsSilent())) - { - 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,oper_reason.c_str()); - } - } - a->GetUser()->AddToWhoWas(); - } - - if (iter != ServerInstance->clientlist->end()) - { - if (IS_LOCAL(a->GetUser())) - { - std::vector::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->clientlist->erase(iter); - delete a->GetUser(); - } - - list.erase(list.begin()); - exempt.erase(exemptiter); + list[i]->Call(); } - return n; + list.clear(); } -