X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=a1e4aa99825fa710ec094b0700a088a46b153422;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=b7254fd0b0d3bd3ba3b4a6fed6fe69fd2986257c;hpb=0cf08426b2ff53d6fc1ca8125a57c79d87070b7b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index b7254fd0b..a1e4aa998 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -2,162 +2,200 @@ * | 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; +CullItem::CullItem(userrec* u, std::string &r, const char* o_reason) +{ + this->user = u; + this->reason = r; + this->silent = false; + /* Seperate oper reason not set, use the user reason */ + if (*o_reason) + this->oper_reason = o_reason; + else + this->oper_reason = r; +} -bool CullList::IsValid(userrec* user) +CullItem::CullItem(userrec* u, const char* r, const char* o_reason) { - time_t esignon = 0; - std::map::iterator es = exempt.find(user); - if (es != exempt.end()) - esignon = es->second; + this->user = u; + this->reason = r; + this->silent = false; + /* Seperate oper reason not set, use the user reason */ + if (*o_reason) + this->oper_reason = o_reason; + else + this->oper_reason = r; +} - 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; +void CullItem::MakeSilent() +{ + this->silent = true; } -CullItem::CullItem(userrec* u, std::string &r) +bool CullItem::IsSilent() { - this->user = u; - this->reason = r; + return this->silent; } -CullItem::CullItem(userrec* u, const char* r) +CullItem::~CullItem() { - this->user = u; - this->reason = r; } userrec* CullItem::GetUser() { - return this->user; + return this->user; +} + +std::string& CullItem::GetReason() +{ + return this->reason; } -std::string CullItem::GetReason() +std::string& CullItem::GetOperReason() { - return this->reason; + return this->oper_reason; } -CullList::CullList() +CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance) { list.clear(); - exempt.clear(); + exempt.clear(); +} + +void CullList::AddItem(userrec* user, std::string &reason, const char* o_reason) +{ + AddItem(user, reason.c_str(), o_reason); } -void CullList::AddItem(userrec* user, std::string &reason) + +void CullList::AddItem(userrec* user, const char* reason, const char* o_reason) { if (exempt.find(user) == exempt.end()) { - CullItem item(user,reason); - list.push_back(item); - exempt[user] = user->signon; + CullItem item(user, reason, o_reason); + list.push_back(item); + exempt[user] = user; } } -void CullList::AddItem(userrec* user, const char* reason) +void CullList::MakeSilent(userrec* user) { - if (exempt.find(user) == exempt.end()) + for (std::vector::iterator a = list.begin(); a != list.end(); ++a) { - CullItem item(user,reason); - list.push_back(item); - exempt[user] = user->signon; + if (a->GetUser() == user) + { + a->MakeSilent(); + break; + } } + return; } 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()); + const char* preset_reason = a->GetUser()->GetOperQuit(); + std::string reason = a->GetReason(); + std::string oper_reason = *preset_reason ? preset_reason : a->GetOperReason(); + + if (reason.length() > MAXQUIT - 1) + reason.resize(MAXQUIT - 1); + if (oper_reason.length() > MAXQUIT - 1) + oper_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, oper_reason.c_str()); + if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError()))) + a->GetUser()->FlushWriteBuf(); + } + + if (a->GetUser()->registered == REG_ALL) + { + FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(), reason, oper_reason)); + a->GetUser()->PurgeEmptyChannels(); + a->GetUser()->WriteCommonQuit(reason, oper_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) + { + if (IS_LOCAL(a->GetUser())) + { + if (!a->IsSilent()) + { + ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str()); + } + } + else + { + if ((!ServerInstance->SilentULine(a->GetUser()->server)) && (!a->IsSilent())) + { + 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,oper_reason.c_str()); + } + } + a->GetUser()->AddToWhoWas(); + } + + if (iter != ServerInstance->clientlist->end()) { - kill_link(u,a->GetReason().c_str()); - 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->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; } +