diff options
| -rw-r--r-- | include/cull_list.h | 85 | ||||
| -rw-r--r-- | include/users.h | 3 | ||||
| -rw-r--r-- | src/commands/cmd_kill.cpp | 2 | ||||
| -rw-r--r-- | src/cull_list.cpp | 12 | ||||
| -rw-r--r-- | src/users.cpp | 6 |
5 files changed, 13 insertions, 95 deletions
diff --git a/include/cull_list.h b/include/cull_list.h index 25c4b48a5..ff22880b4 100644 --- a/include/cull_list.h +++ b/include/cull_list.h @@ -14,81 +14,8 @@ #ifndef __CULLLIST_H__ #define __CULLLIST_H__ -// include the common header files - -#include <string> -#include <deque> -#include <vector> - -class InspIRCd; - -/** The CullItem class holds a user and their quitmessage, - * and is used internally by the CullList class to compile - * a list of users which are to be culled when a long - * operation (such as a netsplit) has completed. - */ -class CoreExport CullItem : public classbase -{ - private: - /** Holds a pointer to the user, - * must be valid and can be a local or remote user. - */ - User* user; - /** Holds the quit reason to use for this user. - */ - std::string reason; - /** Holds the quit reason opers see, if different from users - */ - std::string oper_reason; - /** Silent items dont generate an snotice. - */ - bool silent; - public: - /** Constrcutor. - * Initializes the CullItem with a user pointer - * and their quit reason - * @param u The user to add - * @param r The quit reason of the added user - * @param ro The quit reason to show to opers only - */ - CullItem(User* u, std::string &r, const char* ro = ""); - /** Constrcutor. - * Initializes the CullItem with a user pointer - * and their quit reason - * @param u The user to add - * @param r The quit reason of the added user - * @param ro The quit reason to show to opers only - */ - CullItem(User* u, const char* r, const char* ro = ""); - - /** Make the quit silent a module is dealing with - * displaying this users quit, so we shouldn't - * send anything out. - */ - void MakeSilent(); - - /** Returns true if the quit for this user has been set - * to silent. - */ - bool IsSilent(); - - /** Destructor - */ - ~CullItem(); - - /** Returns a pointer to the user - */ - User* GetUser(); - /** Returns the user's quit reason - */ - std::string& GetReason(); - /** Returns oper reason - */ - std::string& GetOperReason(); -}; - -/** The CullList class can be used by modules, and is used - * by the core, to compile large lists of users in preperation +/** The CullList class is used by the core to create lists of users + * prior to actually quitting (and deleting the objects) all at once. * to quitting them all at once. This is faster than quitting * them within the loop, as the loops become tighter with * little or no comparisons within them. The CullList class @@ -99,6 +26,8 @@ class CoreExport CullItem : public classbase * or remote users, but it may only hold each user once. If * you attempt to add the same user twice, then the second * attempt will be ignored. + * + * NOTE: Don't use this outside core, use the QuitUser method like everyone else! */ class CoreExport CullList : public classbase { @@ -107,10 +36,6 @@ class CoreExport CullList : public classbase */ InspIRCd* ServerInstance; - /** Holds a list of users already added for quick lookup - */ - std::map<User*, User*> exempt; - /** Holds a list of users being quit. * See the information for CullItem for * more information. @@ -119,8 +44,6 @@ class CoreExport CullList : public classbase public: /** Constructor. - * Clears the CullList::list and CullList::exempt - * items. * @param Instance Creator of this CullList object */ CullList(InspIRCd* Instance); diff --git a/include/users.h b/include/users.h index a452ec014..d9330d427 100644 --- a/include/users.h +++ b/include/users.h @@ -636,9 +636,8 @@ class CoreExport User : public connection * are dropped into the bit-bucket. * This value is set by QuitUser, and is not needed seperately from that call. * Please note that setting this value alone will NOT cause the user to quit. - * This means it can be used seperately, for example by shun modules etc. */ - bool muted; + bool quitting; /** IPV4 or IPV6 ip address. Use SetSockAddr to set this and GetProtocolFamily/ * GetIPString/GetPort to obtain its values. diff --git a/src/commands/cmd_kill.cpp b/src/commands/cmd_kill.cpp index 675532a3c..6a1e64d7f 100644 --- a/src/commands/cmd_kill.cpp +++ b/src/commands/cmd_kill.cpp @@ -90,7 +90,7 @@ CmdResult CommandKill::Handle (const char** parameters, int pcnt, User *user) /* Bug #419, make sure this message can only occur once even in the case of multiple KILL messages crossing the network, and change to show * hidekillsserver as source if possible */ - if (!u->muted) + if (!u->quitting) { u->Write(":%s KILL %s :%s!%s!%s (%s)", *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : user->GetFullHost(), u->nick, diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 2b769e893..365cca231 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -19,16 +19,14 @@ CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance) { list.clear(); - exempt.clear(); } void CullList::AddItem(User* user) { - if (exempt.find(user) == exempt.end()) - { - list.push_back(user); - exempt[user] = user; - } + if (user->quitting) + return; + + list.push_back(user); } void CullList::MakeSilent(User* user) @@ -48,7 +46,6 @@ int CullList::Apply() User *u = (*a); user_hash::iterator iter = ServerInstance->clientlist->find(u->nick); - std::map<User*, User*>::iterator exemptiter = exempt.find(u); const char* preset_reason = u->GetOperQuit(); std::string reason = u->operquitmsg; std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg; @@ -131,7 +128,6 @@ int CullList::Apply() delete u; list.erase(list.begin()); - exempt.erase(exemptiter); } return n; diff --git a/src/users.cpp b/src/users.cpp index 538f8d33b..5f37d08bb 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -181,7 +181,7 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance Penalty = 0; lines_in = lastping = signon = idle_lastmsg = nping = registered = 0; ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0; - OverPenalty = ExemptFromPenalty = muted = exempt = haspassed = dns_done = false; + OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false; fd = -1; recvq.clear(); sendq.clear(); @@ -708,7 +708,7 @@ void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreaso { Instance->Log(DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str()); user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str()); - user->muted = true; + user->quitting = true; user->quietquit = false; user->quitmsg = quitreason; user->operquitmsg = operreason; @@ -1700,7 +1700,7 @@ void User::ShowRULES() void User::HandleEvent(EventType et, int errornum) { - if (this->muted) // drop everything, user is due to be quit + if (this->quitting) // drop everything, user is due to be quit return; /* WARNING: May delete this user! */ |