X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_whowas.cpp;h=1531f6239d74baf02d94e67caaac69e46a214fe8;hb=4c83624ed825ca123401a45c8d2844ba6453a85b;hp=6b2d31919f7833070d2e7b76c121e3994bda5a0f;hpb=9f13269062094853b023d09b4ac24d2cf08a0de2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp index 6b2d31919..1531f6239 100644 --- a/src/cmd_whowas.cpp +++ b/src/cmd_whowas.cpp @@ -11,11 +11,12 @@ * --------------------------------------------------- */ -#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); } @@ -24,7 +25,7 @@ cmd_whowas::cmd_whowas(InspIRCd* Instance) : command_t(Instance, "WHOWAS", 0, 1) { syntax = "{,}"; - timer = new MaintainTimer(Instance, 3600); + timer = new WhoWasMaintainTimer(Instance, 3600); Instance->Timers->AddTimer(timer); } @@ -36,27 +37,22 @@ CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user) 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; @@ -70,10 +66,10 @@ CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user) 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); @@ -81,7 +77,6 @@ CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user) } 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; @@ -132,7 +127,8 @@ void cmd_whowas::GetStats(Extensible* ext) 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) @@ -145,12 +141,8 @@ 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); @@ -159,22 +151,22 @@ void cmd_whowas::AddToWhoWas(userrec* user) 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(); @@ -183,17 +175,13 @@ void cmd_whowas::AddToWhoWas(userrec* user) 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(); } } @@ -215,24 +203,28 @@ void cmd_whowas::PruneWhoWas(time_t t) 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(); } @@ -249,7 +241,7 @@ void cmd_whowas::PruneWhoWas(time_t t) 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; @@ -259,7 +251,7 @@ void cmd_whowas::PruneWhoWas(time_t t) while (n->begin() != n->end() && nickcount > groupsize) { WhoWasGroup *a = *(n->begin()); - DELETE(a); + delete a; n->pop_front(); nickcount--; } @@ -278,7 +270,7 @@ void cmd_whowas::MaintainWhoWas(time_t t) while ((n->begin() != n->end()) && ((*n->begin())->signon < t - ServerInstance->Config->WhoWasMaxKeep)) { WhoWasGroup *a = *(n->begin()); - DELETE(a); + delete a; n->erase(n->begin()); } } @@ -297,24 +289,28 @@ cmd_whowas::~cmd_whowas() 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(); } @@ -342,7 +338,7 @@ WhoWasGroup::~WhoWasGroup() } /* 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) @@ -350,7 +346,4 @@ void MaintainTimer::Tick(time_t t) std::deque params; whowas_command->HandleInternal(WHOWAS_MAINTAIN, params); } - - timer = new MaintainTimer(ServerInstance, 3600); - ServerInstance->Timers->AddTimer(timer); }