X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=bfbe518cbbb0b781c09bd0f23979b03e5711a6a6;hb=546534d98ee6319453f5cab488241ba0f2525e4e;hp=628c80019befa13a8fd5ec80fcb534d2c223b76f;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 628c80019..bfbe518cb 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,103 +11,136 @@ * --------------------------------------------------- */ +/* $Core */ + #include "inspircd.h" -#include "users.h" #include "cull_list.h" -/* - * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets. - */ -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 = 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; -} - -CullItem::CullItem(userrec* u, std::string &r) -{ - this->user = u; - this->reason = r; -} - -CullItem::CullItem(userrec* u, const char* r) -{ - this->user = u; - this->reason = r; -} - -CullItem::~CullItem() -{ -} - -userrec* CullItem::GetUser() -{ - return this->user; -} - -std::string& CullItem::GetReason() -{ - return this->reason; -} - CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance) { list.clear(); - exempt.clear(); } -void CullList::AddItem(userrec* user, std::string &reason) +void CullList::AddItem(User* user) { - if (exempt.find(user) == exempt.end()) + if (user->quitting) { - CullItem item(user,reason); - list.push_back(item); - exempt[user] = user->signon; + ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str()); + return; } + + user->quitting = true; + list.push_back(user); } -void CullList::AddItem(userrec* user, const char* reason) +void CullList::MakeSilent(User* user) { - if (exempt.find(user) == exempt.end()) - { - CullItem item(user,reason); - list.push_back(item); - exempt[user] = user->signon; - } + user->quietquit = true; + return; } int CullList::Apply() { int n = list.size(); - while (list.size()) + int i = 0; + + while (list.size() && i++ != 100) { - std::vector::iterator a = list.begin(); + std::vector::iterator a = list.begin(); + + User *u = (*a); + user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick); + const std::string& preset_reason = u->GetOperQuit(); + std::string reason; + std::string oper_reason; + + reason.assign(u->quitmsg, 0, ServerInstance->Config->Limits.MaxQuit); + oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, ServerInstance->Config->Limits.MaxQuit); + + if (u->registered != REG_ALL) + if (ServerInstance->Users->unregistered_count) + ServerInstance->Users->unregistered_count--; + + if (IS_LOCAL(u)) + { + if (!u->sendq.empty()) + u->FlushWriteBuf(); + } - userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str()); + 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 (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()); + } + } + + 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 (!u->quietquit) + { + ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]", u->nick.c_str(), u->ident.c_str(), u->host.c_str(), oper_reason.c_str()); + } + } + else + { + 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(), oper_reason.c_str()); + } + } + u->AddToWhoWas(); + } + + if (iter != ServerInstance->Users->clientlist->end()) + { + ServerInstance->Users->clientlist->erase(iter); + } + 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.erase(list.begin()); } + return n; } +