-/* +------------------------------------+
- * | 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) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-/* $Core */
#include "inspircd.h"
-#include "cull_list.h"
-
-CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
-{
- list.clear();
-}
+#include <typeinfo>
-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<LocalUser *> working;
+ while (!SQlist.empty())
{
- std::vector<User *>::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<LocalUser *>::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<classbase*> gone;
+ std::vector<classbase*> 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);
+ ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Deleting %s @%p", typeid(*c).name(),
+ (void*)c);
+ 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<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
- {
- 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.size())
+ {
+ 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();
+}