X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=c050e9887ec5a9ec34df3df932b9d69ed6ca6fea;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=2b6e4578c619578311aea1363f9a73cd95e9d911;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 2b6e4578c..c050e9887 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -1,122 +1,90 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2015 Attila Molnar + * Copyright (C) 2013, 2020 Sadie Powell + * Copyright (C) 2012 Robby + * Copyright (C) 2011 jackmcbarn + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007, 2010 Craig Edwards + * Copyright (C) 2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core */ #include "inspircd.h" -#include "cull_list.h" - -CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance) -{ - list.clear(); -} +#ifdef INSPIRCD_ENABLE_RTTI +#include +#endif -void CullList::AddItem(User* user) +void CullList::Apply() { - list.push_back(user); -} - -void CullList::MakeSilent(User* user) -{ - user->quietquit = true; - return; -} - -int CullList::Apply() -{ - int n = list.size(); - int i = 0; - - while (list.size() && i++ != 100) + std::vector working; + while (!SQlist.empty()) { - std::vector::iterator a = list.begin(); - - 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->Users->unregistered_count) - ServerInstance->Users->unregistered_count--; - - if (IS_LOCAL(u)) - { - if (!u->sendq.empty()) - u->FlushWriteBuf(); - - if (u->GetIOHook()) - { - try - { - u->GetIOHook()->OnRawSocketClose(u->GetFd()); - } - catch (CoreException& modexcept) - { - ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); - } - } - - 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 (u->registered == REG_ALL) + working.swap(SQlist); + for(std::vector::iterator a = working.begin(); a != working.end(); a++) { - 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(), 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.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str()); - } - } - u->AddToWhoWas(); + LocalUser *u = *a; + ServerInstance->SNO->WriteGlobalSno('a', "User %s SendQ exceeds connect class maximum of %lu", + u->nick.c_str(), u->MyClass->GetSendqHardMax()); + ServerInstance->Users->QuitUser(u, "SendQ exceeded"); } - - if (iter != ServerInstance->Users->clientlist->end()) + working.clear(); + } + 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->Users->clientlist->erase(iter); +#ifdef INSPIRCD_ENABLE_RTTI + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Deleting %s @%p", typeid(*c).name(), + (void*)c); +#else + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Deleting @%p", (void*)c); +#endif + c->cull(); + queue.push_back(c); } else { - ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic.."); - } - - if (IS_LOCAL(u)) - { - std::vector::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 - { - ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector.."); - } + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "WARNING: Object @%p culled twice!", + (void*)c); } - - delete u; - list.erase(list.begin()); } - - return n; + list.clear(); + for(unsigned int i=0; i < queue.size(); i++) + { + classbase* c = queue[i]; + delete c; + } + if (!list.empty()) + { + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "WARNING: Objects added to cull list in a destructor"); + Apply(); + } } +void ActionList::Run() +{ + for(unsigned int i=0; i < list.size(); i++) + { + list[i]->Call(); + } + list.clear(); +}