X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_stats.cpp;h=19e429a95e92089924cc590e47ea39f69b791116;hb=e0dc7691c4cff3a38bc12adf10b3709d8c4901ba;hp=ef6a12d34e9a85c0d4c31faac630983f57f793fa;hpb=565544fac966b14e046bb3042ab485f79bcf7c9e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp index ef6a12d34..19e429a95 100644 --- a/src/coremods/core_stats.cpp +++ b/src/coremods/core_stats.cpp @@ -1,9 +1,16 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2018 Puck Meerburg + * Copyright (C) 2018 Dylan Frank + * Copyright (C) 2016-2020 Sadie Powell + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012 ChrisTX + * Copyright (C) 2012 Adam * Copyright (C) 2009-2010 Daniel De Graaf - * Copyright (C) 2007-2008 Craig Edwards - * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2008, 2010 Craig Edwards * * 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 @@ -21,6 +28,7 @@ #include "inspircd.h" #include "xline.h" +#include "modules/stats.h" #ifdef _WIN32 #include @@ -31,18 +39,28 @@ */ class CommandStats : public Command { + Events::ModuleEventProvider statsevprov; void DoStats(Stats::Context& stats); + public: - /** Constructor for stats. - */ - CommandStats ( Module* parent) : Command(parent,"STATS",1,2) { allow_empty_last_param = false; syntax = " []"; } + /** STATS characters which non-opers can request. */ + std::string userstats; + + CommandStats(Module* Creator) + : Command(Creator, "STATS", 1, 2) + , statsevprov(Creator, "event/stats") + { + allow_empty_last_param = false; + syntax = " []"; + } + /** Handle command. * @param parameters The parameters to the command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos)) return ROUTE_UNICAST(parameters[1]); @@ -67,7 +85,7 @@ void CommandStats::DoStats(Stats::Context& stats) User* const user = stats.GetSource(); const char statschar = stats.GetSymbol(); - bool isPublic = ServerInstance->Config->UserStats.find(statschar) != std::string::npos; + bool isPublic = userstats.find(statschar) != std::string::npos; bool isRemoteOper = IS_REMOTE(user) && (user->IsOper()); bool isLocalOperWithPrivs = IS_LOCAL(user) && user->HasPrivPermission("servers/auspex"); @@ -82,7 +100,7 @@ void CommandStats::DoStats(Stats::Context& stats) } ModResult MOD_RESULT; - FIRST_MOD_RESULT(OnStats, MOD_RESULT, (stats)); + FIRST_MOD_RESULT_CUSTOM(statsevprov, Stats::EventListener, OnStats, MOD_RESULT, (stats)); if (MOD_RESULT == MOD_RES_DENY) { stats.AddRow(219, statschar, "End of /STATS report"); @@ -99,10 +117,21 @@ void CommandStats::DoStats(Stats::Context& stats) for (std::vector::const_iterator i = ServerInstance->ports.begin(); i != ServerInstance->ports.end(); ++i) { ListenSocket* ls = *i; - std::string type = ls->bind_tag->getString("type", "clients"); - std::string hook = ls->bind_tag->getString("ssl", "plaintext"); + std::stringstream portentry; - stats.AddRow(249, ls->bind_sa.str() + " (" + type + ", " + hook + ")"); + const std::string type = ls->bind_tag->getString("type", "clients", 1); + portentry << ls->bind_sa.str() << " (type: " << type; + + const std::string hook = ls->bind_tag->getString("hook"); + if (!hook.empty()) + portentry << ", hook: " << hook; + + const std::string sslprofile = ls->bind_tag->getString("sslprofile", ls->bind_tag->getString("ssl")); + if (!sslprofile.empty()) + portentry << ", ssl profile: " << sslprofile; + + portentry << ')'; + stats.AddRow(249, portentry.str()); } } break; @@ -131,7 +160,7 @@ void CommandStats::DoStats(Stats::Context& stats) else param.append(c->host); - row.push(param).push(c->config->getString("port", "*")); + row.push(param).push(c->config->getString("port", "*", 1)); row.push(ConvToStr(c->GetRecvqMax())).push(ConvToStr(c->GetSendqSoftMax())).push(ConvToStr(c->GetSendqHardMax())).push(ConvToStr(c->GetCommandRate())); param = ConvToStr(c->GetPenaltyThreshold()); @@ -177,19 +206,19 @@ void CommandStats::DoStats(Stats::Context& stats) break; case 'k': - ServerInstance->XLines->InvokeStats("K",216,stats); + ServerInstance->XLines->InvokeStats("K", stats); break; case 'g': - ServerInstance->XLines->InvokeStats("G",223,stats); + ServerInstance->XLines->InvokeStats("G", stats); break; case 'q': - ServerInstance->XLines->InvokeStats("Q",217,stats); + ServerInstance->XLines->InvokeStats("Q", stats); break; case 'Z': - ServerInstance->XLines->InvokeStats("Z",223,stats); + ServerInstance->XLines->InvokeStats("Z", stats); break; case 'e': - ServerInstance->XLines->InvokeStats("E",223,stats); + ServerInstance->XLines->InvokeStats("E", stats); break; case 'E': { @@ -239,12 +268,13 @@ void CommandStats::DoStats(Stats::Context& stats) /* Not sure why we were doing '0' with a RUSAGE_SELF comment rather than just using RUSAGE_SELF -- Om */ if (!getrusage(RUSAGE_SELF,&R)) /* RUSAGE_SELF */ { +#ifndef __HAIKU__ stats.AddRow(249, "Total allocation: "+ConvToStr(R.ru_maxrss)+"K"); stats.AddRow(249, "Signals: "+ConvToStr(R.ru_nsignals)); stats.AddRow(249, "Page faults: "+ConvToStr(R.ru_majflt)); stats.AddRow(249, "Swaps: "+ConvToStr(R.ru_nswap)); stats.AddRow(249, "Context Switches: Voluntary; "+ConvToStr(R.ru_nvcsw)+" Involuntary; "+ConvToStr(R.ru_nivcsw)); - +#endif float n_elapsed = (ServerInstance->Time() - ServerInstance->stats.LastSampled.tv_sec) * 1000000 + (ServerInstance->Time_ns() - ServerInstance->stats.LastSampled.tv_nsec) / 1000; float n_eaten = ((R.ru_utime.tv_sec - ServerInstance->stats.LastCPU.tv_sec) * 1000000 + R.ru_utime.tv_usec - ServerInstance->stats.LastCPU.tv_usec); @@ -308,10 +338,10 @@ void CommandStats::DoStats(Stats::Context& stats) /* stats o */ case 'o': { - ConfigTagList tags = ServerInstance->Config->ConfTags("oper"); - for(ConfigIter i = tags.first; i != tags.second; ++i) + for (ServerConfig::OperIndex::const_iterator i = ServerInstance->Config->oper_blocks.begin(); i != ServerInstance->Config->oper_blocks.end(); ++i) { - ConfigTag* tag = i->second; + OperInfo* ifo = i->second; + ConfigTag* tag = ifo->oper_block; stats.AddRow(243, 'O', tag->getString("host"), '*', tag->getString("name"), tag->getString("type"), '0'); } } @@ -364,9 +394,9 @@ void CommandStats::DoStats(Stats::Context& stats) return; } -CmdResult CommandStats::Handle (const std::vector& parameters, User *user) +CmdResult CommandStats::Handle(User* user, const Params& parameters) { - if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName) + if (parameters.size() > 1 && !irc::equals(parameters[1], ServerInstance->Config->ServerName)) { // Give extra penalty if a non-oper does /STATS LocalUser* localuser = IS_LOCAL(user); @@ -386,4 +416,27 @@ CmdResult CommandStats::Handle (const std::vector& parameters, User return CMD_SUCCESS; } -COMMAND_INIT(CommandStats) +class CoreModStats : public Module +{ + private: + CommandStats cmd; + + public: + CoreModStats() + : cmd(this) + { + } + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + ConfigTag* security = ServerInstance->Config->ConfValue("security"); + cmd.userstats = security->getString("userstats"); + } + + Version GetVersion() CXX11_OVERRIDE + { + return Version("Provides the STATS command", VF_CORE | VF_VENDOR); + } +}; + +MODULE_INIT(CoreModStats)