WhoWasMaintainTimer * timer;
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
{
return new cmd_whowas(Instance);
}
cmd_whowas::cmd_whowas(InspIRCd* Instance)
-: command_t(Instance, "WHOWAS", 0, 1)
+: Command(Instance, "WHOWAS", 0, 1)
{
syntax = "<nick>{,<nick>}";
timer = new WhoWasMaintainTimer(Instance, 3600);
Instance->Timers->AddTimer(timer);
}
-CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
+CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, User* user)
{
/* if whowas disabled in config */
if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
switch (id)
{
case WHOWAS_ADD:
- AddToWhoWas((userrec*)parameters[0]);
+ AddToWhoWas((User*)parameters[0]);
break;
case WHOWAS_STATS:
ext->Extend("stats", stats.c_str());
}
-void cmd_whowas::AddToWhoWas(userrec* user)
+void cmd_whowas::AddToWhoWas(User* user)
{
/* if whowas disabled */
if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
if (iter != whowas.end())
{
whowas_set* n = (whowas_set*)iter->second;
+
if (n->size())
{
while (n->begin() != n->end())
{
WhoWasGroup *a = *(n->begin());
- DELETE(a);
+ delete a;
n->pop_front();
}
}
- DELETE(n);
+
+ delete n;
whowas.erase(iter);
}
whowas_fifo.pop_front();
if ((int)(group->size()) > ServerInstance->Config->WhoWasGroupSize)
{
WhoWasGroup *a = (WhoWasGroup*)*(group->begin());
- DELETE(a);
+ delete a;
group->pop_front();
}
}
if (fifosize > maxgroups || whowas_fifo[0].first < t - maxkeep)
{
iter = whowas.find(whowas_fifo[0].second);
+
/* hopefully redundant integrity check, but added while debugging r6216 */
if (iter == whowas.end())
{
ServerInstance->Log(DEFAULT, "BUG: Whowas maps got corrupted! (1)");
return;
}
+
whowas_set* n = (whowas_set*)iter->second;
+
if (n->size())
{
while (n->begin() != n->end())
{
WhoWasGroup *a = *(n->begin());
- DELETE(a);
+ delete a;
n->pop_front();
}
}
- DELETE(n);
+
+ delete n;
whowas.erase(iter);
whowas_fifo.pop_front();
}
while (n->begin() != n->end() && nickcount > groupsize)
{
WhoWasGroup *a = *(n->begin());
- DELETE(a);
+ delete a;
n->pop_front();
nickcount--;
}
while ((n->begin() != n->end()) && ((*n->begin())->signon < t - ServerInstance->Config->WhoWasMaxKeep))
{
WhoWasGroup *a = *(n->begin());
- DELETE(a);
+ delete a;
n->erase(n->begin());
}
}
while ((fifosize = (int)whowas_fifo.size()) > 0)
{
iter = whowas.find(whowas_fifo[0].second);
+
/* hopefully redundant integrity check, but added while debugging r6216 */
if (iter == whowas.end())
{
ServerInstance->Log(DEFAULT, "BUG: Whowas maps got corrupted! (3)");
return;
}
+
whowas_set* n = (whowas_set*)iter->second;
+
if (n->size())
{
while (n->begin() != n->end())
{
WhoWasGroup *a = *(n->begin());
- DELETE(a);
+ delete a;
n->pop_front();
}
}
- DELETE(n);
+
+ delete n;
whowas.erase(iter);
whowas_fifo.pop_front();
}
}
-WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
+WhoWasGroup::WhoWasGroup(User* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
{
this->host = strdup(user->host);
this->dhost = strdup(user->dhost);
/* every hour, run this function which removes all entries older than Config->WhoWasMaxKeep */
void WhoWasMaintainTimer::Tick(time_t t)
{
- command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+ Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
if (whowas_command)
{
std::deque<classbase*> params;