X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_lusers.cpp;h=91a71809034902d3cf312763eabc52ea8fd671bb;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=ca970bbb606d3102a3af02d6ad868340e7e96320;hpb=d383ce9b72bf5c58bb0571998b282cf67cf7635c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp index ca970bbb6..91a718090 100644 --- a/src/commands/cmd_lusers.cpp +++ b/src/commands/cmd_lusers.cpp @@ -1,25 +1,49 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" -#ifndef CMD_LUSERS_H -#define CMD_LUSERS_H +struct LusersCounters +{ + unsigned int max_local; + unsigned int max_global; + unsigned int invisible; + + LusersCounters() + : max_local(ServerInstance->Users->LocalUserCount()) + , max_global(ServerInstance->Users->RegisteredUserCount()) + , invisible(ServerInstance->Users->ModeCount('i')) + { + } -// include the common header files + inline void UpdateMaxUsers() + { + unsigned int current = ServerInstance->Users->LocalUserCount(); + if (current > max_local) + max_local = current; -#include "users.h" -#include "channels.h" + current = ServerInstance->Users->RegisteredUserCount(); + if (current > max_global) + max_global = current; + } +}; /** Handle /LUSERS. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work @@ -28,12 +52,12 @@ */ class CommandLusers : public Command { - unsigned int max_local, max_global; + LusersCounters& counters; public: /** Constructor for lusers. */ - CommandLusers ( Module* parent) : Command(parent,"LUSERS",0,0), - max_local(0), max_global(0) + CommandLusers(Module* parent, LusersCounters& Counters) + : Command(parent,"LUSERS",0,0), counters(Counters) { } /** Handle command. * @param parameters The parameters to the comamnd @@ -44,22 +68,17 @@ class CommandLusers : public Command CmdResult Handle(const std::vector& parameters, User *user); }; -#endif - - /** Handle /LUSERS */ CmdResult CommandLusers::Handle (const std::vector&, User *user) { - unsigned int n_users = ServerInstance->Users->UserCount(); - unsigned int n_invis = ServerInstance->Users->ModeCount('i'); + unsigned int n_users = ServerInstance->Users->RegisteredUserCount(); ProtoServerList serverlist; ServerInstance->PI->GetServerList(serverlist); - int n_serv = 0; - int n_local_servs = 0; + unsigned int n_serv = serverlist.size(); + unsigned int n_local_servs = 0; for(ProtoServerList::iterator i = serverlist.begin(); i != serverlist.end(); ++i) { - n_serv++; if (i->parentname == ServerInstance->Config->ServerName) n_local_servs++; } @@ -67,14 +86,10 @@ CmdResult CommandLusers::Handle (const std::vector&, User *user) if (!n_serv) n_serv = 1; - // these are updated on every connect (or /lusers invocation), which is good enough - if (ServerInstance->Users->LocalUserCount() > max_local) - max_local = ServerInstance->Users->LocalUserCount(); - if (n_users > max_global) - max_global = n_users; + counters.UpdateMaxUsers(); user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick.c_str(), - n_users-n_invis, n_invis, n_serv); + n_users - counters.invisible, counters.invisible, n_serv); if (ServerInstance->Users->OperCount()) user->WriteNumeric(252, "%s %d :operator(s) online",user->nick.c_str(),ServerInstance->Users->OperCount()); @@ -84,11 +99,75 @@ CmdResult CommandLusers::Handle (const std::vector&, User *user) user->WriteNumeric(254, "%s %ld :channels formed",user->nick.c_str(),ServerInstance->ChannelCount()); user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),n_local_servs); - user->WriteNumeric(265, "%s :Current Local Users: %d Max: %d",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),max_local); - user->WriteNumeric(266, "%s :Current Global Users: %d Max: %d",user->nick.c_str(),n_users,max_global); + user->WriteNumeric(265, "%s :Current Local Users: %d Max: %d", user->nick.c_str(), ServerInstance->Users->LocalUserCount(), counters.max_local); + user->WriteNumeric(266, "%s :Current Global Users: %d Max: %d", user->nick.c_str(), n_users, counters.max_global); return CMD_SUCCESS; } +class InvisibleWatcher : public ModeWatcher +{ + unsigned int& invisible; +public: + InvisibleWatcher(Module* mod, unsigned int& Invisible) + : ModeWatcher(mod, 'i', MODETYPE_USER), invisible(Invisible) + { + } + + void AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding, ModeType type) + { + if (dest->registered != REG_ALL) + return; + + if (adding) + invisible++; + else + invisible--; + } +}; + +class ModuleLusers : public Module +{ + LusersCounters counters; + CommandLusers cmd; + InvisibleWatcher mw; + + public: + ModuleLusers() + : cmd(this, counters), mw(this, counters.invisible) + { + } + + void init() + { + ServerInstance->Modules->AddService(cmd); + Implementation events[] = { I_OnPostConnect, I_OnUserQuit }; + ServerInstance->Modules->Attach(events, this, sizeof(events)/sizeof(Implementation)); + ServerInstance->Modes->AddModeWatcher(&mw); + } + + void OnPostConnect(User* user) + { + counters.UpdateMaxUsers(); + if (user->IsModeSet('i')) + counters.invisible++; + } + + void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) + { + if (user->IsModeSet('i')) + counters.invisible--; + } + + ~ModuleLusers() + { + ServerInstance->Modes->DelModeWatcher(&mw); + } + + Version GetVersion() + { + return Version("LUSERS", VF_VENDOR | VF_CORE); + } +}; -COMMAND_INIT(CommandLusers) +MODULE_INIT(ModuleLusers)