-int CullList::Apply()
-{
- int n = 0;
- while (list.size())
- {
- std::vector<CullItem>::iterator a = list.begin();
- userrec* u = a->GetUser();
- std::string reason = a->GetReason();
- kill_link(u,reason.c_str());
- list.erase(list.begin());
- n++;
- }
- return n;
+ if (IS_LOCAL(u))
+ {
+ if (!u->sendq.empty())
+ u->FlushWriteBuf();
+
+ 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(), u->operquitmsg.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(), u->operquitmsg.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<User*>::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.clear();