X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=07649ed819b173240c1563bb107e7273506295ec;hb=90ea385688339d21861166d7de840fc0494edcdb;hp=0951a3224b57cc3dd608b923ea4c8b7d65b46e7a;hpb=57f498f8045c9ca010b09b860fe7c5a9ef9cf8c4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 0951a3224..07649ed81 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -2,167 +2,113 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; +/* $Core */ -#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; - -bool CullList::IsValid(userrec* user) -{ - 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++) - { - /* - * 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); - } - return false; -} - -CullItem::CullItem(userrec* u, std::string &r) +CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance) { - this->user = u; - this->reason = strdup(r.c_str()); } -CullItem::CullItem(userrec* u, const char* r) +void CullList::AddItem(User* user) { - this->user = u; - this->reason = strdup(r); + list.push_back(user); } -CullItem::~CullItem() +void CullList::MakeSilent(User* user) { - free(reason); + user->quietquit = true; + return; } -userrec* CullItem::GetUser() +void CullList::Apply() { - return this->user; -} + for(std::vector::iterator a = list.begin(); a != list.end(); a++) + { + 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); -const char* CullItem::GetReason() -{ - return this->reason; -} + if (u->registered != REG_ALL) + if (ServerInstance->Users->unregistered_count) + ServerInstance->Users->unregistered_count--; -CullList::CullList() -{ - list.clear(); - exempt.clear(); -} + if (IS_LOCAL(u)) + { + if (!u->sendq.empty()) + u->FlushWriteBuf(); -void CullList::AddItem(userrec* user, std::string &reason) -{ - if (exempt.find(user) == exempt.end()) - { - CullItem item(user,reason); - list.push_back(item); - exempt[user] = user->signon; - } -} + 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()); + } + } -void CullList::AddItem(userrec* user, const char* reason) -{ - if (exempt.find(user) == exempt.end()) - { - CullItem item(user,reason); - list.push_back(item); - exempt[user] = user->signon; - } -} + ServerInstance->SE->DelFd(u); + u->CloseSocket(); + } -int CullList::Apply() -{ - 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. + /* + * 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 (IsValid(u)) + if (u->registered == REG_ALL) { - 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) + 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 { - ServerInstance->DoOneIteration(false); + 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(); + } + + if (iter != ServerInstance->Users->clientlist->end()) + { + ServerInstance->Users->clientlist->erase(iter); } - } - return n; + 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.."); + } + } + + delete u; + } + list.clear(); } +