X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=07649ed819b173240c1563bb107e7273506295ec;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=ee257350ed523bd3efbde751c25f0af35bebc887;hpb=545736adb5c4b8a3b1dc416f4e05ffb256b019cf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index ee257350e..07649ed81 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,192 +11,104 @@ * --------------------------------------------------- */ +/* $Core */ + #include "inspircd.h" -#include "users.h" #include "cull_list.h" -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; -} - -CullItem::CullItem(userrec* 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; -} - -void CullItem::MakeSilent() -{ - this->silent = true; -} - -bool CullItem::IsSilent() -{ - return this->silent; -} - -CullItem::~CullItem() -{ -} - -userrec* CullItem::GetUser() -{ - return this->user; -} - -std::string& CullItem::GetReason() -{ - return this->reason; -} - -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, const char* o_reason) +void CullList::AddItem(User* user) { - AddItem(user, reason.c_str(), o_reason); + list.push_back(user); } - -void CullList::AddItem(userrec* user, const char* reason, const char* o_reason) +void CullList::MakeSilent(User* user) { - if (exempt.find(user) == exempt.end()) - { - CullItem item(user, reason, o_reason); - list.push_back(item); - exempt[user] = user; - } -} - -void CullList::MakeSilent(userrec* user) -{ - for (std::vector::iterator a = list.begin(); a != list.end(); ++a) - { - if (a->GetUser() == user) - { - a->MakeSilent(); - break; - } - } + user->quietquit = true; return; } -int CullList::Apply() +void CullList::Apply() { - int n = list.size(); - while (list.size()) + for(std::vector::iterator a = list.begin(); a != list.end(); a++) { - std::vector::iterator a = list.begin(); + User *u = *a; + // user has been moved onto their UID; that's why this isn't find(u->nick) + user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->uuid); - 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 (u->registered != REG_ALL) + if (ServerInstance->Users->unregistered_count) + ServerInstance->Users->unregistered_count--; - 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())) + if (IS_LOCAL(u)) { - 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 (!u->sendq.empty()) + u->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())) + if (u->GetIOHook()) { try { - ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())->OnRawSocketClose(a->GetUser()->GetFd()); + u->GetIOHook()->OnRawSocketClose(u->GetFd()); } catch (CoreException& modexcept) { - ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } - ServerInstance->SE->DelFd(a->GetUser()); - a->GetUser()->CloseSocket(); + 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 (a->GetUser()->registered == REG_ALL) + if (u->registered == REG_ALL) { - if (IS_LOCAL(a->GetUser())) + if (IS_LOCAL(u)) { - if (!a->IsSilent()) + if (!u->quietquit) { - ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str()); + ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]", u->nick.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str()); } } else { - if ((!ServerInstance->SilentULine(a->GetUser()->server)) && (!a->IsSilent())) + if ((!ServerInstance->SilentULine(u->server)) && (!u->quietquit)) { - 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()); + 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(), u->operquitmsg.c_str()); } } - a->GetUser()->AddToWhoWas(); + 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 (iter != ServerInstance->clientlist->end()) + if (IS_LOCAL(u)) { - if (IS_LOCAL(a->GetUser())) + 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 { - 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->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector.."); } - ServerInstance->clientlist->erase(iter); - DELETE(a->GetUser()); } - list.erase(list.begin()); - exempt.erase(exemptiter); + delete u; } - return n; + list.clear(); }