X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=2a022449f96d9e165684539262450dd2cf67146b;hb=b844d1cbbe79585facc69b9247baa8427cff0b62;hp=0951a3224b57cc3dd608b923ea4c8b7d65b46e7a;hpb=57f498f8045c9ca010b09b860fe7c5a9ef9cf8c4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 0951a3224..2a022449f 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -2,167 +2,146 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/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; - -#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) { - this->user = u; - this->reason = strdup(r.c_str()); + this->user = u; + this->reason = r; } CullItem::CullItem(userrec* u, const char* r) { this->user = u; - this->reason = strdup(r); + this->reason = r; } CullItem::~CullItem() { - free(reason); } userrec* CullItem::GetUser() { - return this->user; + return this->user; } -const char* CullItem::GetReason() +std::string& CullItem::GetReason() { - return this->reason; + return this->reason; } -CullList::CullList() +CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance) { list.clear(); - exempt.clear(); + exempt.clear(); } 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; - } + AddItem(user, reason.c_str()); } + 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; + exempt[user] = user; } } int CullList::Apply() { - int n = 0; - while (list.size()) - { + int n = list.size(); + 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. + + user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick); + std::map::iterator exemptiter = exempt.find(a->GetUser()); + std::string reason = a->GetReason(); + + if (reason.length() > MAXQUIT - 1) + reason.resize(MAXQUIT - 1); + + if (a->GetUser()->registered != REG_ALL) + if (ServerInstance->unregistered_count) + ServerInstance->unregistered_count--; + + if (IS_LOCAL(a->GetUser())) + { + a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]",a->GetUser()->ident,a->GetUser()->host,reason.c_str()); + if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError()))) + a->GetUser()->FlushWriteBuf(); + } + + if (a->GetUser()->registered == REG_ALL) + { + a->GetUser()->PurgeEmptyChannels(); + a->GetUser()->WriteCommonExcept("QUIT :%s",reason.c_str()); + FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(),reason)); + } + + FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser())); + + if (IS_LOCAL(a->GetUser())) + { + if (ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())) + { + try + { + ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())->OnRawSocketClose(a->GetUser()->GetFd()); + } + catch (CoreException& modexcept) + { + ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + } + } + + ServerInstance->SE->DelFd(a->GetUser()); + a->GetUser()->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 (IsValid(u)) + if (a->GetUser()->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(a->GetUser())) + ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str()); + else + ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str()); + a->GetUser()->AddToWhoWas(); + } + + if (iter != ServerInstance->clientlist->end()) + { + if (IS_LOCAL(a->GetUser())) { - ServerInstance->DoOneIteration(false); + std::vector::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser()); + if (x != ServerInstance->local_users.end()) + ServerInstance->local_users.erase(x); } + ServerInstance->clientlist->erase(iter); + DELETE(a->GetUser()); } - } - return n; + + list.erase(list.begin()); + exempt.erase(exemptiter); + } + return n; }