* ---------------------------------------------------
*/
-#include "configreader.h"
-#include "users.h"
+#include "inspircd.h"
#include "commands/cmd_whowas.h"
-extern "C" command_t* init_command(InspIRCd* Instance)
+WhoWasMaintainTimer * timer;
+
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
{
return new cmd_whowas(Instance);
}
: command_t(Instance, "WHOWAS", 0, 1)
{
syntax = "<nick>{,<nick>}";
- timer = new MaintainTimer(Instance, 3600);
+ timer = new WhoWasMaintainTimer(Instance, 3600);
Instance->Timers->AddTimer(timer);
}
user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
return CMD_FAILURE;
}
-
- whowas_users::iterator i = whowas.find(parameters[0]);
- ServerInstance->Log(DEBUG,"Entered cmd_whowas");
+ whowas_users::iterator i = whowas.find(parameters[0]);
if (i == whowas.end())
{
- ServerInstance->Log(DEBUG,"No such nick in whowas");
user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
return CMD_FAILURE;
}
else
{
- ServerInstance->Log(DEBUG,"Whowas set found");
whowas_set* grp = i->second;
if (grp->size())
{
for (whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
{
- ServerInstance->Log(DEBUG,"Spool whowas entry");
WhoWasGroup* u = *ux;
time_t rawtime = u->signon;
tm *timeinfo;
user->WriteServ("314 %s %s %s %s * :%s",user->nick,parameters[0],u->ident,u->dhost,u->gecos);
- if(*user->oper)
+ if (IS_OPER(user))
user->WriteServ("379 %s %s :was connecting from *@%s", user->nick, parameters[0], u->host);
- if(*ServerInstance->Config->HideWhoisServer && !(*user->oper))
+ if (*ServerInstance->Config->HideWhoisServer && !IS_OPER(user))
user->WriteServ("312 %s %s %s :%s",user->nick,parameters[0], ServerInstance->Config->HideWhoisServer, b);
else
user->WriteServ("312 %s %s %s :%s",user->nick,parameters[0], u->server, b);
}
else
{
- ServerInstance->Log(DEBUG,"Oops, empty whowas set found");
user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
return CMD_FAILURE;
whowas_bytes += (sizeof(whowas_set) + ( sizeof(WhoWasGroup) * n->size() ) );
}
}
- ext->Extend("stats", std::string("Whowas(MAPSETS) " +ConvToStr(whowas_size)+" ("+ConvToStr(whowas_bytes)+" bytes)").c_str());
+ stats.assign("Whowas(MAPSETS) " +ConvToStr(whowas_size)+" ("+ConvToStr(whowas_bytes)+" bytes)");
+ ext->Extend("stats", stats.c_str());
}
void cmd_whowas::AddToWhoWas(userrec* user)
whowas_users::iterator iter = whowas.find(user->nick);
- ServerInstance->Log(DEBUG,"Add to whowas lists");
-
if (iter == whowas.end())
{
- ServerInstance->Log(DEBUG,"Adding new whowas set for %s",user->nick);
-
whowas_set* n = new whowas_set;
WhoWasGroup *a = new WhoWasGroup(user);
n->push_back(a);
if ((int)(whowas.size()) > ServerInstance->Config->WhoWasMaxGroups)
{
- ServerInstance->Log(DEBUG,"Maxgroups of %d reached deleting oldest group '%s'",ServerInstance->Config->WhoWasMaxGroups, whowas_fifo[0].second.c_str());
-
whowas_users::iterator iter = whowas.find(whowas_fifo[0].second);
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();
else
{
whowas_set* group = (whowas_set*)iter->second;
-
- ServerInstance->Log(DEBUG,"Using existing whowas group for %s",user->nick);
-
WhoWasGroup *a = new WhoWasGroup(user);
group->push_back(a);
if ((int)(group->size()) > ServerInstance->Config->WhoWasGroupSize)
{
- ServerInstance->Log(DEBUG,"Trimming existing group '%s' to %d entries",user->nick, 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())
{
/* this should never happen, if it does maps are corrupt */
- ServerInstance->Log(DEBUG, "Whowas maps got corrupted! (1)");
+ 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();
}
if (iter == whowas.end())
{
/* this should never happen, if it does maps are corrupt */
- ServerInstance->Log(DEBUG, "Whowas maps got corrupted! (2)");
+ ServerInstance->Log(DEFAULT, "BUG: Whowas maps got corrupted! (2)");
return;
}
whowas_set* n = (whowas_set*)iter->second;
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())
{
/* this should never happen, if it does maps are corrupt */
- ServerInstance->Log(DEBUG, "Whowas maps got corrupted! (3)");
+ 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();
}
}
/* every hour, run this function which removes all entries older than Config->WhoWasMaxKeep */
-void MaintainTimer::Tick(time_t t)
+void WhoWasMaintainTimer::Tick(time_t t)
{
command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
if (whowas_command)
projects / user / henk / code / inspircd.git / blobdiff