X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=07649ed819b173240c1563bb107e7273506295ec;hb=da1010f4077eae5d1602c9fe7d74a2426387b8b2;hp=2a022449f96d9e165684539262450dd2cf67146b;hpb=9a52a667163a6abc5b83fd268b55c9062b55131f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 2a022449f..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,137 +11,104 @@ * --------------------------------------------------- */ +/* $Core */ + #include "inspircd.h" -#include "users.h" #include "cull_list.h" -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) { - AddItem(user, reason.c_str()); + 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; - } + 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_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick); - std::map::iterator exemptiter = exempt.find(a->GetUser()); - std::string reason = a->GetReason(); - - if (reason.length() > MAXQUIT - 1) - reason.resize(MAXQUIT - 1); + 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); - if (a->GetUser()->registered != REG_ALL) - if (ServerInstance->unregistered_count) - ServerInstance->unregistered_count--; + if (u->registered != REG_ALL) + if (ServerInstance->Users->unregistered_count) + ServerInstance->Users->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,reason.c_str()); - if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError()))) - a->GetUser()->FlushWriteBuf(); - } - - if (a->GetUser()->registered == REG_ALL) - { - a->GetUser()->PurgeEmptyChannels(); - a->GetUser()->WriteCommonExcept("QUIT :%s",reason.c_str()); - FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(),reason)); - } - - FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser())); + if (!u->sendq.empty()) + u->FlushWriteBuf(); - 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())) - ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str()); + 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(), u->operquitmsg.c_str()); + } + } else - 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,reason.c_str()); - a->GetUser()->AddToWhoWas(); + { + 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(), u->operquitmsg.c_str()); + } + } + u->AddToWhoWas(); } - if (iter != ServerInstance->clientlist->end()) + if (iter != ServerInstance->Users->clientlist->end()) { - if (IS_LOCAL(a->GetUser())) + 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 { - 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(); } +