extern InspIRCd* ServerInstance;
extern user_hash clientlist;
+/*
+ * 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;
return false;
}
-CullItem::CullItem(userrec* u, std::string r)
+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()
+std::string& CullItem::GetReason()
{
return this->reason;
}
exempt.clear();
}
-void CullList::AddItem(userrec* user, std::string reason)
+void CullList::AddItem(userrec* user, std::string &reason)
{
if (exempt.find(user) == exempt.end())
{
}
}
+void CullList::AddItem(userrec* user, const char* reason)
+{
+ if (exempt.find(user) == exempt.end())
+ {
+ CullItem item(user,reason);
+ list.push_back(item);
+ exempt[user] = user->signon;
+ }
+}
+
int CullList::Apply()
{
int n = 0;
while (list.size())
{
std::vector<CullItem>::iterator a = list.begin();
- userrec* u = a->GetUser();
- /* Because ServerInstance->DoOneIteration can
- * take the user away from us in the middle of
- * our operation, we should check to see if this
- * pointer is still valid by iterating the hash.
- * It's expensive, yes, but the DoOneIteration
- * call stops it being horrendously bad.
- */
- if (IsValid(u))
- {
- kill_link(u,a->GetReason().c_str());
- list.erase(list.begin());
- /* So that huge numbers of quits dont block,
- * we yield back to our mainloop every 15
- * iterations.
- * The DoOneIteration call basically acts
- * like a software threading mechanism.
- */
- if (((n++) % 15) == 0)
- {
- ServerInstance->DoOneIteration(false);
- }
- }
+
+ kill_link(a->GetUser(), a->GetReason().c_str());
+ list.erase(list.begin());
}
return n;
}