X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_whowas.cpp;h=e04a69200ac010a83ce679b0c9a877d88b1decca;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=71fa6d73800efe78945e0e9a4b3386b3951e6d1b;hpb=e3bcb9b9054ad5b488365b80896634fe6cf105c0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp index 71fa6d738..e04a69200 100644 --- a/src/coremods/core_whowas.cpp +++ b/src/coremods/core_whowas.cpp @@ -25,7 +25,6 @@ CommandWhowas::CommandWhowas( Module* parent) : Command(parent, "WHOWAS", 1) - , GroupSize(0), MaxGroups(0), MaxKeep(0) { syntax = "{,}"; Penalty = 2; @@ -34,67 +33,70 @@ CommandWhowas::CommandWhowas( Module* parent) CmdResult CommandWhowas::Handle (const std::vector& parameters, User* user) { /* if whowas disabled in config */ - if (this->GroupSize == 0 || this->MaxGroups == 0) + if (!manager.IsEnabled()) { - user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :This command has been disabled.", name.c_str()); + user->WriteNumeric(ERR_UNKNOWNCOMMAND, name, "This command has been disabled."); return CMD_FAILURE; } - whowas_users::const_iterator it = whowas.find(parameters[0]); - if (it == whowas.end()) + const WhoWas::Nick* const nick = manager.FindNick(parameters[0]); + if (!nick) { - user->WriteNumeric(ERR_WASNOSUCHNICK, "%s :There was no such nickname", parameters[0].c_str()); + user->WriteNumeric(ERR_WASNOSUCHNICK, parameters[0], "There was no such nickname"); } else { - const WhoWas::Nick& nick = *it->second; - const WhoWas::Nick::List& list = nick.entries; - if (!list.empty()) + const WhoWas::Nick::List& list = nick->entries; + for (WhoWas::Nick::List::const_iterator i = list.begin(); i != list.end(); ++i) { - for (WhoWas::Nick::List::const_iterator i = list.begin(); i != list.end(); ++i) - { - WhoWasGroup* u = *i; + WhoWas::Entry* u = *i; - user->WriteNumeric(RPL_WHOWASUSER, "%s %s %s * :%s", parameters[0].c_str(), - u->ident.c_str(),u->dhost.c_str(),u->gecos.c_str()); + user->WriteNumeric(RPL_WHOWASUSER, parameters[0], u->ident, u->dhost, '*', u->gecos); - if (user->HasPrivPermission("users/auspex")) - user->WriteNumeric(RPL_WHOWASIP, "%s :was connecting from *@%s", - parameters[0].c_str(), u->host.c_str()); + if (user->HasPrivPermission("users/auspex")) + user->WriteNumeric(RPL_WHOWASIP, parameters[0], InspIRCd::Format("was connecting from *@%s", u->host.c_str())); - std::string signon = InspIRCd::TimeString(u->signon); - bool hide_server = (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex")); - user->WriteNumeric(RPL_WHOISSERVER, "%s %s :%s", parameters[0].c_str(), (hide_server ? ServerInstance->Config->HideWhoisServer.c_str() : u->server.c_str()), signon.c_str()); - } - } - else - { - user->WriteNumeric(ERR_WASNOSUCHNICK, "%s :There was no such nickname", parameters[0].c_str()); + std::string signon = InspIRCd::TimeString(u->signon); + bool hide_server = (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex")); + user->WriteNumeric(RPL_WHOISSERVER, parameters[0], (hide_server ? ServerInstance->Config->HideWhoisServer : u->server), signon); } } - user->WriteNumeric(RPL_ENDOFWHOWAS, "%s :End of WHOWAS", parameters[0].c_str()); + user->WriteNumeric(RPL_ENDOFWHOWAS, parameters[0], "End of WHOWAS"); return CMD_SUCCESS; } -std::string CommandWhowas::GetStats() +WhoWas::Manager::Manager() + : GroupSize(0), MaxGroups(0), MaxKeep(0) { - int whowas_size = 0; - for (whowas_users::iterator i = whowas.begin(); i != whowas.end(); ++i) +} + +const WhoWas::Nick* WhoWas::Manager::FindNick(const std::string& nickname) const +{ + whowas_users::const_iterator it = whowas.find(nickname); + if (it == whowas.end()) + return NULL; + return it->second; +} + +WhoWas::Manager::Stats WhoWas::Manager::GetStats() const +{ + size_t entrycount = 0; + for (whowas_users::const_iterator i = whowas.begin(); i != whowas.end(); ++i) { WhoWas::Nick::List& list = i->second->entries; - whowas_size += list.size(); + entrycount += list.size(); } - return "Whowas entries: " + ConvToStr(whowas_size); + + Stats stats; + stats.entrycount = entrycount; + return stats; } -void CommandWhowas::AddToWhoWas(User* user) +void WhoWas::Manager::Add(User* user) { - /* if whowas disabled */ - if (this->GroupSize == 0 || this->MaxGroups == 0) - { + if (!IsEnabled()) return; - } // Insert nick if it doesn't exist // 'first' will point to the newly inserted element or to the existing element with an equivalent key @@ -104,7 +106,7 @@ void CommandWhowas::AddToWhoWas(User* user) { // This nick is new, create a list for it and add the first record to it WhoWas::Nick* nick = new WhoWas::Nick(ret.first->first); - nick->entries.push_back(new WhoWasGroup(user)); + nick->entries.push_back(new Entry(user)); ret.first->second = nick; // Add this nick to the fifo too @@ -113,17 +115,14 @@ void CommandWhowas::AddToWhoWas(User* user) if (whowas.size() > this->MaxGroups) { // Too many nicks, remove the nick which was inserted the longest time ago from both the map and the fifo - nick = whowas_fifo.front(); - whowas_fifo.pop_front(); - whowas.erase(nick->nick); - delete nick; + PurgeNick(whowas_fifo.front()); } } else { // We've met this nick before, add a new record to the list WhoWas::Nick::List& list = ret.first->second->entries; - list.push_back(new WhoWasGroup(user)); + list.push_back(new Entry(user)); // If there are too many records for this nick, remove the oldest (front) if (list.size() > this->GroupSize) @@ -135,7 +134,7 @@ void CommandWhowas::AddToWhoWas(User* user) } /* on rehash, refactor maps according to new conf values */ -void CommandWhowas::Prune() +void WhoWas::Manager::Prune() { time_t min = ServerInstance->Time() - this->MaxKeep; @@ -144,24 +143,13 @@ void CommandWhowas::Prune() { WhoWas::Nick* nick = whowas_fifo.front(); if ((whowas_fifo.size() > this->MaxGroups) || (nick->addtime < min)) - { - /* hopefully redundant integrity check, but added while debugging r6216 */ - if (!whowas.erase(nick->nick)) - { - /* this should never happen, if it does maps are corrupt */ - ServerInstance->Logs->Log("WHOWAS", LOG_DEFAULT, "BUG: Whowas maps got corrupted! (1)"); - return; - } - - whowas_fifo.pop_front(); - delete nick; - } + PurgeNick(nick); else break; } /* Then cut the whowas sets to new size (groupsize) */ - for (whowas_users::iterator i = whowas.begin(); i != whowas.end(); ++i) + for (whowas_users::iterator i = whowas.begin(); i != whowas.end(); ) { WhoWas::Nick::List& list = i->second->entries; while (list.size() > this->GroupSize) @@ -169,14 +157,19 @@ void CommandWhowas::Prune() delete list.front(); list.pop_front(); } + + if (list.empty()) + PurgeNick(i++); + else + ++i; } } /* call maintain once an hour to remove expired nicks */ -void CommandWhowas::Maintain() +void WhoWas::Manager::Maintain() { time_t min = ServerInstance->Time() - this->MaxKeep; - for (whowas_users::iterator i = whowas.begin(); i != whowas.end(); ++i) + for (whowas_users::iterator i = whowas.begin(); i != whowas.end(); ) { WhoWas::Nick::List& list = i->second->entries; while (!list.empty() && list.front()->signon < min) @@ -184,10 +177,15 @@ void CommandWhowas::Maintain() delete list.front(); list.pop_front(); } + + if (list.empty()) + PurgeNick(i++); + else + ++i; } } -CommandWhowas::~CommandWhowas() +WhoWas::Manager::~Manager() { for (whowas_users::iterator i = whowas.begin(); i != whowas.end(); ++i) { @@ -196,8 +194,48 @@ CommandWhowas::~CommandWhowas() } } -WhoWasGroup::WhoWasGroup(User* user) : host(user->host), dhost(user->dhost), ident(user->ident), - server(user->server->GetName()), gecos(user->fullname), signon(user->signon) +bool WhoWas::Manager::IsEnabled() const +{ + return ((GroupSize != 0) && (MaxGroups != 0)); +} + +void WhoWas::Manager::UpdateConfig(unsigned int NewGroupSize, unsigned int NewMaxGroups, unsigned int NewMaxKeep) +{ + if ((NewGroupSize == GroupSize) && (NewMaxGroups == MaxGroups) && (NewMaxKeep == MaxKeep)) + return; + + GroupSize = NewGroupSize; + MaxGroups = NewMaxGroups; + MaxKeep = NewMaxKeep; + Prune(); +} + +void WhoWas::Manager::PurgeNick(whowas_users::iterator it) +{ + WhoWas::Nick* nick = it->second; + whowas_fifo.erase(nick); + whowas.erase(it); + delete nick; +} + +void WhoWas::Manager::PurgeNick(WhoWas::Nick* nick) +{ + whowas_users::iterator it = whowas.find(nick->nick); + if (it == whowas.end()) + { + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in whowas database, please report"); + return; + } + PurgeNick(it); +} + +WhoWas::Entry::Entry(User* user) + : host(user->host) + , dhost(user->dhost) + , ident(user->ident) + , server(user->server->GetName()) + , gecos(user->fullname) + , signon(user->signon) { } @@ -224,18 +262,18 @@ class ModuleWhoWas : public Module void OnGarbageCollect() { // Remove all entries older than MaxKeep - cmd.Maintain(); + cmd.manager.Maintain(); } void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) { - cmd.AddToWhoWas(user); + cmd.manager.Add(user); } ModResult OnStats(char symbol, User* user, string_list &results) { if (symbol == 'z') - results.push_back("249 "+user->nick+" :"+cmd.GetStats()); + results.push_back("249 "+user->nick+" :Whowas entries: "+ConvToStr(cmd.manager.GetStats().entrycount)); return MOD_RES_PASSTHRU; } @@ -247,13 +285,7 @@ class ModuleWhoWas : public Module unsigned int NewMaxGroups = tag->getInt("maxgroups", 10240, 0, 1000000); unsigned int NewMaxKeep = tag->getDuration("maxkeep", 3600, 3600); - if ((NewGroupSize == cmd.GroupSize) && (NewMaxGroups == cmd.MaxGroups) && (NewMaxKeep == cmd.MaxKeep)) - return; - - cmd.GroupSize = NewGroupSize; - cmd.MaxGroups = NewMaxGroups; - cmd.MaxKeep = NewMaxKeep; - cmd.Prune(); + cmd.manager.UpdateConfig(NewGroupSize, NewMaxGroups, NewMaxKeep); } Version GetVersion()