X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=5c7eb7b4258855ebeef7f3c18e4feffbf65d9597;hb=2d4a319d961e3f9e6aa9f7926f9ed320d72de8da;hp=3f2050679fb8899d523787cd249e9e68a3f54608;hpb=b7a990e474461921f79b0b8846fcb338dd18982c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 3f2050679..5c7eb7b42 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -16,91 +16,26 @@ #include "inspircd.h" #include "cull_list.h" -CullItem::CullItem(User* 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(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; -} - -void CullItem::MakeSilent() -{ - this->silent = true; -} - -bool CullItem::IsSilent() -{ - return this->silent; -} - -CullItem::~CullItem() -{ -} - -User* 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(User* user, std::string &reason, const char* o_reason) +void CullList::AddItem(User* user) { - 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()) + if (user->quitting) { - CullItem *item = new CullItem(user, reason, o_reason); - list.push_back(item); - exempt[user] = user; + 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::MakeSilent(User* user) { - for (std::vector::iterator a = list.begin(); a != list.end(); ++a) - { - if ((*a)->GetUser() == user) - { - (*a)->MakeSilent(); - break; - } - } + user->quietquit = true; return; } @@ -111,27 +46,24 @@ int CullList::Apply() while (list.size() && i++ != 100) { - std::vector::iterator a = list.begin(); + std::vector::iterator a = list.begin(); - 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(); + 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; - if (reason.length() > MAXQUIT - 1) - reason.resize(MAXQUIT - 1); - if (oper_reason.length() > MAXQUIT - 1) - oper_reason.resize(MAXQUIT - 1); + 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->unregistered_count) - ServerInstance->unregistered_count--; + if (ServerInstance->Users->unregistered_count) + ServerInstance->Users->unregistered_count--; if (IS_LOCAL(u)) { - if ((!u->sendq.empty()) && (!(*u->GetWriteError()))) + if (!u->sendq.empty()) u->FlushWriteBuf(); } @@ -146,15 +78,15 @@ int CullList::Apply() if (IS_LOCAL(u)) { - if (ServerInstance->Config->GetIOHook(u->GetPort())) + if (u->io) { try { - ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd()); + u->io->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()); } } @@ -170,37 +102,45 @@ int CullList::Apply() { if (IS_LOCAL(u)) { - if (!(*a)->IsSilent()) + if (!u->quietquit) { - ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick,u->ident,u->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(), oper_reason.c_str()); } } else { - if ((!ServerInstance->SilentULine(u->server)) && (!(*a)->IsSilent())) + if ((!ServerInstance->SilentULine(u->server)) && (!u->quietquit)) { - 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()); + 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->clientlist->end()) + if (iter != ServerInstance->Users->clientlist->end()) { - if (IS_LOCAL(u)) + 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(),u); - 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 u; } - delete *list.begin(); + delete u; list.erase(list.begin()); - exempt.erase(exemptiter); } + return n; }