X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=956ed34940f888b5a47d441c8eb914550648ec04;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=0951a3224b57cc3dd608b923ea4c8b7d65b46e7a;hpb=57f498f8045c9ca010b09b860fe7c5a9ef9cf8c4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 0951a3224..956ed3494 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -1,168 +1,80 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005-2007 Craig Edwards * - * Written by Craig Edwards, Craig McLure, and others. - * 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 . */ -using namespace std; -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#include -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include -#include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.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" - -extern InspIRCd* ServerInstance; -extern user_hash clientlist; +#include -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 = clientlist.begin(); u != 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) + { + 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); + } } - return false; -} - -CullItem::CullItem(userrec* u, std::string &r) -{ - this->user = u; - this->reason = strdup(r.c_str()); -} - -CullItem::CullItem(userrec* u, const char* r) -{ - this->user = u; - this->reason = strdup(r); -} - -CullItem::~CullItem() -{ - free(reason); -} - -userrec* CullItem::GetUser() -{ - return this->user; -} - -const char* 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.size()) { - CullItem item(user,reason); - list.push_back(item); - exempt[user] = user->signon; + ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Objects added to cull list in a destructor"); + Apply(); } } -int CullList::Apply() +void ActionList::Run() { - int n = 0; - while (list.size()) - { - std::vector::iterator a = list.begin(); - userrec* u = a->GetUser(); - /* Because ServerInstance->DoOneIteration can - * take the user away from us in the middle of - * our operation, we should check to see if this - * pointer is still valid by iterating the hash. - * It's expensive, yes, but the DoOneIteration - * call stops it being horrendously bad. - */ - if (IsValid(u)) - { - kill_link(u,a->GetReason()); - list.erase(list.begin()); - /* So that huge numbers of quits dont block, - * we yield back to our mainloop every 15 - * iterations. - * The DoOneIteration call basically acts - * like a software threading mechanism. - */ - if (((n++) % 15) == 0) - { - ServerInstance->DoOneIteration(false); - } - } - } - return n; + for(unsigned int i=0; i < list.size(); i++) + { + list[i]->Call(); + } + list.clear(); }