X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=c050e9887ec5a9ec34df3df932b9d69ed6ca6fea;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=18c86f631af53c372718cfa7991e3a25ba6d435a;hpb=fd2eb26472bcc0b7b144f40523ff820cba82f574;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 18c86f631..c050e9887 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -1,138 +1,90 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * 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 * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * 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. * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ -using namespace std; -#include "inspircd_config.h" -#include "inspircd.h" -#include -#include -#include -#include -#include -#include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "commands.h" -#include "xline.h" -#include "inspstring.h" #include "inspircd.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" -#include "cull_list.h" +#ifdef INSPIRCD_ENABLE_RTTI +#include +#endif -extern InspIRCd* ServerInstance; - -/* - * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets. - */ -bool CullList::IsValid(userrec* user) +void CullList::Apply() { - time_t esignon = 0; - std::map::iterator es = exempt.find(user); - if (es != exempt.end()) - esignon = es->second; - - for (user_hash::iterator u = ServerInstance->clientlist.begin(); u != ServerInstance->clientlist.end(); u++) + std::vector working; + while (!SQlist.empty()) { - /* - * BUGFIX - * - * Because there is an undetermined period of time between a user existing, - * and this function being called, we have to check for the following condition: - * - * Between CullList::AddItem(u) being called, and CullList::IsValid(u) being called, - * the user with the pointer u has quit, but only to be REPLACED WITH A NEW USER WHO - * BECAUSE OF ALLOCATION RULES, HAS THE SAME MEMORY ADDRESS! To prevent this, we - * cross reference each pointer to the user's signon time, and if the signon times - * do not match, we return false here to indicate this user is NOT valid as it - * seems to differ from the pointer snapshot we got a few seconds earlier. Should - * prevent a few random crashes during netsplits. - */ - if (user == u->second) - return (u->second->signon == esignon); + working.swap(SQlist); + for(std::vector::iterator a = working.begin(); a != working.end(); a++) + { + 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"); + } + 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) + { +#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", LOG_DEBUG, "WARNING: Object @%p culled twice!", + (void*)c); + } } - return false; -} - -CullItem::CullItem(userrec* u, std::string &r) -{ - this->user = u; - this->reason = r; -} - -CullItem::CullItem(userrec* u, const char* r) -{ - this->user = u; - this->reason = r; -} - -CullItem::~CullItem() -{ -} - -userrec* CullItem::GetUser() -{ - return this->user; -} - -std::string& CullItem::GetReason() -{ - return this->reason; -} - -CullList::CullList() -{ list.clear(); - exempt.clear(); -} - -void CullList::AddItem(userrec* user, std::string &reason) -{ - if (exempt.find(user) == exempt.end()) + for(unsigned int i=0; i < queue.size(); i++) { - CullItem item(user,reason); - list.push_back(item); - exempt[user] = user->signon; + classbase* c = queue[i]; + delete c; } -} - -void CullList::AddItem(userrec* user, const char* reason) -{ - if (exempt.find(user) == exempt.end()) + if (!list.empty()) { - CullItem item(user,reason); - list.push_back(item); - exempt[user] = user->signon; + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "WARNING: Objects added to cull list in a destructor"); + Apply(); } } -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(); - - userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str()); - list.erase(list.begin()); + list[i]->Call(); } - return n; + list.clear(); }