X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=8dd1f6ae142347b212cedcf401e34c717fca5972;hb=3593e33ce374caee9aec0575b49ec9b0001a8ec6;hp=2fb31014bbad1f73dadbe50f18d3003191374b47;hpb=9bc04a302572eb311a147a32ff1d36f1d91f2d7a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 2fb31014b..8dd1f6ae1 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -2,94 +2,59 @@ * | 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; +/* $Core: libIRCDcull_list */ -#include "inspircd_config.h" #include "inspircd.h" -#include -#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; - -/* - * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets. - */ -bool CullList::IsValid(userrec* user) +CullItem::CullItem(User* u, std::string &r, const char* o_reason) { - time_t esignon = 0; - std::map::iterator es = exempt.find(user); - if (es != exempt.end()) - esignon = es->second; - - for (user_hash::iterator u = ServerInstance->clientlist.begin(); u != ServerInstance->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; + 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; } -CullItem::CullItem(userrec* u, std::string &r) +CullItem::CullItem(User* u, const char* 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; } -CullItem::CullItem(userrec* u, const char* r) +void CullItem::MakeSilent() { - this->user = u; - this->reason = r; + this->silent = true; +} + +bool CullItem::IsSilent() +{ + return this->silent; } CullItem::~CullItem() { } -userrec* CullItem::GetUser() +User* CullItem::GetUser() { return this->user; } @@ -99,30 +64,44 @@ std::string& CullItem::GetReason() return this->reason; } -CullList::CullList() +std::string& CullItem::GetOperReason() +{ + return this->oper_reason; +} + +CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance) { list.clear(); exempt.clear(); } -void CullList::AddItem(userrec* user, std::string &reason) +void CullList::AddItem(User* user, std::string &reason, const char* o_reason) +{ + AddItem(user, reason.c_str(), o_reason); +} + + +void CullList::AddItem(User* user, const char* reason, const char* o_reason) { if (exempt.find(user) == exempt.end()) { - CullItem item(user,reason); + CullItem item(user, reason, o_reason); list.push_back(item); - exempt[user] = user->signon; + exempt[user] = user; } } -void CullList::AddItem(userrec* user, const char* reason) +void CullList::MakeSilent(User* 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() @@ -132,8 +111,93 @@ int CullList::Apply() { std::vector::iterator a = list.begin(); - userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str()); + User *u = a->GetUser(); + user_hash::iterator iter = ServerInstance->clientlist->find(u->nick); + std::map::iterator exemptiter = exempt.find(u); + const char* preset_reason = u->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 (u->registered != REG_ALL) + if (ServerInstance->unregistered_count) + ServerInstance->unregistered_count--; + + if (IS_LOCAL(u)) + { + if ((!u->sendq.empty()) && (!(*u->GetWriteError()))) + u->FlushWriteBuf(); + } + + if (u->registered == REG_ALL) + { + FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(u, reason, oper_reason)); + u->PurgeEmptyChannels(); + u->WriteCommonQuit(reason, oper_reason); + } + + FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(u)); + + if (IS_LOCAL(u)) + { + if (ServerInstance->Config->GetIOHook(u->GetPort())) + { + try + { + ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd()); + } + catch (CoreException& modexcept) + { + ServerInstance->Log(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) + { + if (IS_LOCAL(u)) + { + if (!a->IsSilent()) + { + ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick,u->ident,u->host,oper_reason.c_str()); + } + } + else + { + if ((!ServerInstance->SilentULine(u->server)) && (!a->IsSilent())) + { + ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",u->server,u->nick,u->ident,u->host,oper_reason.c_str()); + } + } + u->AddToWhoWas(); + } + + if (iter != ServerInstance->clientlist->end()) + { + if (IS_LOCAL(u)) + { + std::vector::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),u); + if (x != ServerInstance->local_users.end()) + ServerInstance->local_users.erase(x); + } + ServerInstance->clientlist->erase(iter); + delete u; + } + list.erase(list.begin()); + exempt.erase(exemptiter); } return n; } +