X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=d2205b80bc7cebaf9746a4037e4707481cc9ce61;hb=d185decae97752368d5cf62311cbc0d1a52aa22c;hp=951103271198e4e11f48497f9d289cd472c995b3;hpb=b94c45340e153254f9dd06ecc3445222f31d0220;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 951103271..d2205b80b 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -13,24 +13,14 @@
 
 #include "inspircd.h"
 #include "httpd.h"
+#include "protocol.h"
 
 /* $ModDesc: Provides statistics over HTTP via m_httpd.so */
 /* $ModDep: httpd.h */
 
-typedef std::map<irc::string,int> StatsHash;
-typedef StatsHash::iterator StatsIter;
-
-typedef std::vector<std::pair<int,irc::string> > SortedList;
-typedef SortedList::iterator SortedIter;
-
-static StatsHash* sh = new StatsHash();
-static SortedList* so = new SortedList();
-
-static StatsHash* Servers = new StatsHash();
-
 class ModuleHttpStats : public Module
 {
-	
+
 	std::string stylesheet;
 	bool changed;
 
@@ -46,46 +36,42 @@ class ModuleHttpStats : public Module
 	{
 		ReadConfig();
 		this->changed = true;
-		Implementation eventlist[] = { I_OnEvent, I_OnRequest, I_OnChannelDelete, I_OnUserJoin, I_OnUserPart, I_OnUserQuit };
-		ServerInstance->Modules->Attach(eventlist, this, 6);
+		Implementation eventlist[] = { I_OnEvent, I_OnRequest };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void InsertOrder(irc::string channel, int count)
+	std::string Sanitize(const std::string &str)
 	{
-		/* This function figures out where in the sorted list to put an item from the hash */
-		SortedIter a;
-		for (a = so->begin(); a != so->end(); a++)
-		{
-			/* Found an item equal to or less than, we insert our item before it */
-			if (a->first <= count)
-			{
-				so->insert(a,std::pair<int,irc::string>(count,channel));
-				return;
-			}
-		}
-		/* There are no items in the list yet, insert something at the beginning */
-		so->insert(so->begin(), std::pair<int,irc::string>(count,channel));
-	}
+		std::string ret;
 
-	void SortList()
-	{
-		/* Sorts the hash into the sorted list using an insertion sort */
-		so->clear();
-		for (StatsIter a = sh->begin(); a != sh->end(); a++)
-			InsertOrder(a->first, a->second);
-		for (user_hash::iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++)
+		for (std::string::const_iterator x = str.begin(); x != str.end(); ++x)
 		{
-			StatsHash::iterator n = Servers->find(u->second->server);
-			if (n != Servers->end())
-			{
-				n->second++;
-			}
-			else
+			switch (*x)
 			{
-				Servers->insert(std::make_pair<irc::string,int>(u->second->server,1));
+				case '<':
+					ret += "&lt;";
+				break;
+				case '>':
+					ret += "&gt;";
+				break;
+				case '&':
+					ret += "&amp;";
+				break;
+				case '"':
+					ret += "&quot;";
+				break;
+				default:
+					if (*x < 32 || *x > 126)
+					{
+						int n = *x;
+						ret += ("&#" + ConvToStr(n) + ";");
+					}
+					else
+						ret += *x;
+				break;
 			}
 		}
-		this->changed = false;
+		return ret;
 	}
 
 	void OnEvent(Event* event)
@@ -94,18 +80,19 @@ class ModuleHttpStats : public Module
 
 		if (event->GetEventID() == "httpd_url")
 		{
+			ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd event");
 			HTTPRequest* http = (HTTPRequest*)event->GetData();
 
 			if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
 			{
 				data << "<inspircdstats>";
 
-				data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>" << ServerInstance->Config->ServerDesc << "</gecos></server>";
+				data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>" << Sanitize(ServerInstance->Config->ServerDesc) << "</gecos></server>";
 
 				data << "<general>";
-				data << "<usercount>" << ServerInstance->clientlist->size() << "</usercount>";
+				data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
 				data << "<channelcount>" << ServerInstance->chanlist->size() << "</channelcount>";
-				data << "<opercount>" << ServerInstance->all_opers.size() << "</opercount>";
+				data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
 				data << "<socketcount>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << "</socketcount><socketmax>" << ServerInstance->SE->GetMaxFds() <<
 					"</socketmax><socketengine>" << ServerInstance->SE->GetName() << "</socketengine>";
 
@@ -114,7 +101,7 @@ class ModuleHttpStats : public Module
 				time_t server_uptime = current_time - ServerInstance->startup_time;
 				struct tm* stime;
 				stime = gmtime(&server_uptime);
-				data << "<uptime><days>" << stime->tm_yday << "</days><hours>" << stime->tm_hour << "</hours><mins>" << stime->tm_min << "</mins><secs>" << stime->tm_sec << "</secs></uptime>";
+				data << "<uptime><days>" << stime->tm_yday << "</days><hours>" << stime->tm_hour << "</hours><mins>" << stime->tm_min << "</mins><secs>" << stime->tm_sec << "</secs><boot_time_t>" << ServerInstance->startup_time << "</boot_time_t></uptime>";
 
 
 				data << "</general>";
@@ -127,39 +114,59 @@ class ModuleHttpStats : public Module
 					data << "<module><name>" << *i << "</name><version>" << v.Major << "." <<  v.Minor << "." << v.Revision << "." << v.Build << "</version></module>";
 				}
 				data << "</modulelist>";
-
 				data << "<channellist>";
-				/* If the list has changed since last time it was displayed, re-sort it
-				 * this time only (not every time, as this would be moronic)
-				 */
-				if (this->changed)
-					this->SortList();
 
-				for (SortedIter a = so->begin(); a != so->end(); a++)
+				for (chan_hash::const_iterator a = ServerInstance->chanlist->begin(); a != ServerInstance->chanlist->end(); ++a)
 				{
-					Channel* c = ServerInstance->FindChan(a->second.c_str());
-					if (c && !c->IsModeSet('s') && !c->IsModeSet('p'))
+					Channel* c = a->second;
+
+					data << "<channel>";
+					data << "<usercount>" << c->GetUsers()->size() << "</usercount><channelname>" << c->name << "</channelname>";
+					data << "<channelops>" << c->GetOppedUsers()->size() << "</channelops>";
+					data << "<channelhalfops>" << c->GetHalfoppedUsers()->size() << "</channelhalfops>";
+					data << "<channelvoices>" << c->GetVoicedUsers()->size() << "</channelvoices>";
+					data << "<channeltopic>" << Sanitize(c->topic) << "</channeltopic>";
+					data << "<channelmodes>" << Sanitize(c->ChanModes(true)) << "</channelmodes>";
+					CUList* ulist = c->GetUsers();
+
+					for (CUList::iterator x = ulist->begin(); x != ulist->end(); ++x)
 					{
-						data << "<channel>";
-						data << "<usercount>" << c->GetUsers()->size() << "</usercount><channelname>" << c->name << "</channelname>";
-						data << "<channelops>" << c->GetOppedUsers()->size() << "</channelops>";
-						data << "<channelhalfops>" << c->GetHalfoppedUsers()->size() << "</channelhalfops>";
-						data << "<channelvoices>" << c->GetVoicedUsers()->size() << "</channelvoices>";
-						data << "<channeltopic>" << c->topic << "</channeltopic>";
-						data << "<channelmodes>" << c->ChanModes(false) << "</channelmodes>";
-						data << "</channel>";
+						data << "<channelmember><uid>" << x->first->uuid << "</uid><privs>" << Sanitize(c->GetAllPrefixChars(x->first)) << "</privs></channelmember>";
 					}
+					data << "</channel>";
+				}
+
+				data << "</channellist><userlist>";
+
+				for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); ++a)
+				{
+					User* u = a->second;
+
+					data << "<user>";
+					data << "<nickname>" << u->nick << "</nickname><uuid>" << u->uuid << "</uuid><realhost>" << u->host << "</realhost><displayhost>" << u->dhost << "</displayhost>";
+					data << "<gecos>" << Sanitize(u->fullname) << "</gecos><server>" << u->server << "</server><away>" << Sanitize(u->awaymsg) << "</away><opertype>" << Sanitize(u->oper) << "</opertype><modes>";
+					std::string modes;
+					for (unsigned char n = 'A'; n <= 'z'; ++n)
+						if (u->IsModeSet(n))
+							modes += n;
+
+					data << modes << "</modes><ident>" << Sanitize(u->ident) << "</ident><port>" << u->GetPort() << "</port><ipaddress>" << u->GetIPString() << "</ipaddress>";
+					data << "</user>";
 				}
 
-				data << "</channellist>";
+				data << "</userlist><serverlist>";
+
+				ProtoServerList sl;
+				ServerInstance->PI->GetServerList(sl);
 
-				data << "<serverlist>";
-				
-				for (StatsHash::iterator b = Servers->begin(); b != Servers->end(); b++)
+				for (ProtoServerList::iterator b = sl.begin(); b != sl.end(); ++b)
 				{
 					data << "<server>";
-					data << "<servername>" << b->first << "</servername>";
-					data << "<usercount>" << b->second << "</usercount>";
+					data << "<servername>" << b->servername << "</servername>";
+					data << "<parentname>" << b->parentname << "</parentname>";
+					data << "<usercount>" << b->usercount << "</usercount>";
+					data << "<opercount>" << b->opercount << "</opercount>";
+					data << "<lagmillisecs>" << b->latencyms << "</lagmillisecs>";
 					data << "</server>";
 				}
 				data << "</serverlist>";
@@ -176,56 +183,7 @@ class ModuleHttpStats : public Module
 		}
 	}
 
-	void OnChannelDelete(Channel* chan)
-	{
-		StatsIter a = sh->find(chan->name);
-		if (a != sh->end())
-		{
-			sh->erase(a);
-		}
-		this->changed = true;
-	}
-
-	void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
-	{
-		StatsIter a = sh->find(channel->name);
-		if (a != sh->end())
-		{
-			a->second++;
-		}
-		else
-		{
-			irc::string name = channel->name;
-			sh->insert(std::pair<irc::string,int>(name,1));
-		}
-		this->changed = true;
-	}
-
-	void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
-	{
-		StatsIter a = sh->find(channel->name);
-		if (a != sh->end())
-		{
-			a->second--;
-		}
-		this->changed = true;
-	}
-
-	void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
-	{
-		for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-		{
-			Channel* c = v->first;
-			StatsIter a = sh->find(c->name);
-			if (a != sh->end())
-			{
-				a->second--;
-			}
-		}
-		this->changed = true;
-	}
-
-	char* OnRequest(Request* request)
+	const char* OnRequest(Request* request)
 	{
 		return NULL;
 	}
@@ -233,13 +191,11 @@ class ModuleHttpStats : public Module
 
 	virtual ~ModuleHttpStats()
 	{
-		delete sh;
-		delete so;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };