#include "cull_list.h"
extern InspIRCd* ServerInstance;
+extern user_hash clientlist;
-CullItem::CullItem(userrec* u, std::string r)
+/*
+ * 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;
+ std::map<userrec*,time_t>::iterator es = exempt.find(user);
+ if (es != exempt.end())
+ esignon = es->second;
+
+ for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ {
+ /*
+ * BUGFIX
+ *
+ * Because there is an undetermined period of time between a user existing,
+ * and this function being called, we have to check for the following condition:
+ *
+ * Between CullList::AddItem(u) being called, and CullList::IsValid(u) being called,
+ * the user with the pointer u has quit, but only to be REPLACED WITH A NEW USER WHO
+ * BECAUSE OF ALLOCATION RULES, HAS THE SAME MEMORY ADDRESS! To prevent this, we
+ * cross reference each pointer to the user's signon time, and if the signon times
+ * do not match, we return false here to indicate this user is NOT valid as it
+ * seems to differ from the pointer snapshot we got a few seconds earlier. Should
+ * prevent a few random crashes during netsplits.
+ */
+ if (user == u->second)
+ return (u->second->signon == esignon);
+ }
+ return false;
+}
+
+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())
{
CullItem item(user,reason);
list.push_back(item);
- exempt[user] = 1;
+ exempt[user] = user->signon;
+ }
+}
+
+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;
}
}
while (list.size())
{
std::vector<CullItem>::iterator a = list.begin();
- userrec* u = a->GetUser();
- kill_link(u,a->GetReason().c_str());
+
+ kill_link(a->GetUser(), 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);
- }
}
return n;
}