* | 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
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "configreader.h"
-#include "modules.h"
-#include "inspsocket.h"
-#include "httpd.h"
#include "inspircd.h"
+#include "httpd.h"
/* $ModDesc: Provides statistics over HTTP via m_httpd.so */
+/* $ModDep: httpd.h */
typedef std::map<irc::string,int> StatsHash;
typedef StatsHash::iterator StatsIter;
static StatsHash* sh = new StatsHash();
static SortedList* so = new SortedList();
+static StatsHash* Servers = new StatsHash();
+
class ModuleHttpStats : public Module
{
this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
}
- ModuleHttpStats(InspIRCd* Me) : Module::Module(Me)
+ ModuleHttpStats(InspIRCd* Me) : Module(Me)
{
-
ReadConfig();
- this->changed = false;
+ this->changed = true;
+ Implementation eventlist[] = { I_OnEvent, I_OnRequest, I_OnChannelDelete, I_OnUserJoin, I_OnUserPart, I_OnUserQuit };
+ ServerInstance->Modules->Attach(eventlist, this, 6);
}
void InsertOrder(irc::string channel, int count)
so->clear();
for (StatsIter a = sh->begin(); a != sh->end(); a++)
InsertOrder(a->first, a->second);
+ for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
+ {
+ StatsHash::iterator n = Servers->find(u->second->server);
+ if (n != Servers->end())
+ {
+ n->second++;
+ }
+ else
+ {
+ Servers->insert(std::make_pair<irc::string,int>(u->second->server,1));
+ }
+ }
this->changed = false;
}
if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
{
- data << "<!DOCTYPE html PUBLIC \
- \"-//W3C//DTD XHTML 1.1//EN\" \
- \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n\
- <html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">";
-
- data << "<head>";
- data << "<link rel='stylesheet' href='" << this->stylesheet << "' type='text/css' />";
- data << "<title>InspIRCd server statisitics for " << ServerInstance->Config->ServerName << " (" << ServerInstance->Config->ServerDesc << ")</title>";
- data << "</head><body>";
- data << "<h1>InspIRCd server statisitics for " << ServerInstance->Config->ServerName << " (" << ServerInstance->Config->ServerDesc << ")</h1>";
-
- data << "<div class='totals'>";
- data << "<h2>Totals</h2>";
- data << "<table>";
- data << "<tr><td>Users</td><td>" << ServerInstance->clientlist.size() << "</td></tr>";
- data << "<tr><td>Channels</td><td>" << ServerInstance->chanlist.size() << "</td></tr>";
- data << "<tr><td>Opers</td><td>" << ServerInstance->all_opers.size() << "</td></tr>";
- data << "<tr><td>Sockets</td><td>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << " (Max: " << ServerInstance->SE->GetMaxFds() << " via socket engine '" << ServerInstance->SE->GetName() << "')</td></tr>";
- data << "</table>";
- data << "</div>";
-
- data << "<div class='modules'>";
- data << "<h2>Modules</h2>";
- data << "<table>";
- for (int i = 0; i <= ServerInstance->GetModuleCount(); i++)
+ data << "<inspircdstats>";
+
+ data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>" << ServerInstance->Config->ServerDesc << "</gecos></server>";
+
+ data << "<general>";
+ data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
+ data << "<channelcount>" << ServerInstance->chanlist->size() << "</channelcount>";
+ 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>";
+
+ time_t current_time = 0;
+ current_time = ServerInstance->Time();
+ 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 << "</general>";
+ data << "<modulelist>";
+ std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
+ for (std::vector<std::string>::iterator i = module_names.begin(); i != module_names.end(); ++i)
{
- if (ServerInstance->Config->module_names[i] != "")
- data << "<tr><td>" << ServerInstance->Config->module_names[i] << "</td></tr>";
+ Module* m = ServerInstance->Modules->Find(i->c_str());
+ Version v = m->GetVersion();
+ data << "<module><name>" << *i << "</name><version>" << v.Major << "." << v.Minor << "." << v.Revision << "." << v.Build << "</version></module>";
}
- data << "</table>";
- data << "</div>";
-
- data << "<div class='channels'>";
- data << "<h2>Channels</h2>";
- data << "<table>";
- data << "<tr><th>Users</th><th>Name</th><th>@</th><th>%</th><th>+</th><th>Topic</th></tr>";
+ 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();
- int n = 0;
- for (SortedIter a = so->begin(); ((a != so->end()) && (n < 25)); a++, n++)
+ for (SortedIter a = so->begin(); a != so->end(); a++)
{
- chanrec* c = ServerInstance->FindChan(a->second.c_str());
- if (c)
+ Channel* c = ServerInstance->FindChan(a->second.c_str());
+ if (c && !c->IsModeSet('s') && !c->IsModeSet('p'))
{
- data << "<tr><td>" << a->first << "</td><td>" << a->second << "</td>";
- data << "<td>" << c->GetOppedUsers()->size() << "</td>";
- data << "<td>" << c->GetHalfoppedUsers()->size() << "</td>";
- data << "<td>" << c->GetVoicedUsers()->size() << "</td>";
- data << "<td>" << c->topic << "</td>";
- data << "</tr>";
+ 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 << "</table>";
- data << "</div>";
-
-
-
-
+ data << "</channellist>";
- data << "<div class='validion'>";
- data << "<p><a href='http://validator.w3.org/check?uri=referer'><img src='http://www.w3.org/Icons/valid-xhtml11' alt='Valid XHTML 1.1' height='31' width='88' /></a></p>";
- data << "</div>";
+ data << "<serverlist>";
- data << "</body>";
- data << "</html>";
+ for (StatsHash::iterator b = Servers->begin(); b != Servers->end(); b++)
+ {
+ data << "<server>";
+ data << "<servername>" << b->first << "</servername>";
+ data << "<usercount>" << b->second << "</usercount>";
+ data << "</server>";
+ }
+ data << "</serverlist>";
+
+ data << "</inspircdstats>";
/* Send the document back to m_httpd */
- HTTPDocument response(http->sock, &data, 200, "X-Powered-By: m_http_stats.so\r\nContent-Type: text/html; charset=iso-8859-1\r\n");
+ HTTPDocument response(http->sock, &data, 200);
+ response.headers.SetHeader("X-Powered-By", "m_httpd_stats.so");
+ response.headers.SetHeader("Content-Type", "text/xml");
Request req((char*)&response, (Module*)this, event->GetSource());
req.Send();
-
- ServerInstance->Log(DEBUG,"Sent");
}
}
}
- void OnChannelDelete(chanrec* chan)
+ void OnChannelDelete(Channel* chan)
{
StatsIter a = sh->find(chan->name);
if (a != sh->end())
this->changed = true;
}
- void OnUserJoin(userrec* user, chanrec* channel)
+ void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
{
StatsIter a = sh->find(channel->name);
if (a != sh->end())
this->changed = true;
}
- void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage)
+ void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
{
StatsIter a = sh->find(channel->name);
if (a != sh->end())
this->changed = true;
}
- void OnUserQuit(userrec* user, const std::string &message)
+ void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
{
for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
{
- chanrec* c = v->first;
+ Channel* c = v->first;
StatsIter a = sh->find(c->name);
if (a != sh->end())
{
this->changed = true;
}
- char* OnRequest(Request* request)
+ const char* OnRequest(Request* request)
{
return NULL;
}
- void Implements(char* List)
- {
- List[I_OnEvent] = List[I_OnRequest] = List[I_OnChannelDelete] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = 1;
- }
virtual ~ModuleHttpStats()
{
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+ return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
}
};
-
-class ModuleHttpStatsFactory : public ModuleFactory
-{
- public:
- ModuleHttpStatsFactory()
- {
- }
-
- ~ModuleHttpStatsFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleHttpStats(Me);
- }
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleHttpStatsFactory;
-}
+MODULE_INIT(ModuleHttpStats)
projects / user / henk / code / inspircd.git / blobdiff