X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_stats.cpp;h=6a4427aef8caeef674b34a1acf6e20004693e684;hb=6adca3e0997781eae4adb02f19a2f8c312512ae1;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..6a4427aef 100644
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -21,6 +21,7 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "modules/stats.h"
 
 #ifdef _WIN32
 #include <psapi.h>
@@ -31,18 +32,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-symbol> [<servername>]"; }
+	/** 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 = "<stats-symbol> [<servername>]";
+	}
+
 	/** 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<std::string>& parameters, User* user) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& 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 +78,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 +93,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");
@@ -239,12 +250,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 +320,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,7 +376,7 @@ void CommandStats::DoStats(Stats::Context& stats)
 	return;
 }
 
-CmdResult CommandStats::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandStats::Handle(User* user, const Params& parameters)
 {
 	if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
 	{
@@ -386,4 +398,27 @@ CmdResult CommandStats::Handle (const std::vector<std::string>& 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)