Add Module::init() for correct exception handling during hook registration

[user/henk/code/inspircd.git] / src / stats.cpp

diff --git a/src/stats.cpp b/src/stats.cpp
index eb8fe0e450403bd0bf37b60af70c2585782e4ffe..b295db4a5b95f86855aa8e2e3ac9daef555c15b3 100644 (file)
--- a/src/stats.cpp
+++ b/src/stats.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -46,12 +46,14 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                {
                        for (size_t i = 0; i < this->ports.size(); i++)
                        {
-                               std::string ip = this->ports[i]->GetIP();
+                               std::string ip = this->ports[i]->bind_addr;
                                if (ip.empty())
                                        ip.assign("*");
+                               std::string type = ports[i]->bind_tag->getString("type", "clients");
+                               std::string hook = ports[i]->bind_tag->getString("ssl", "plaintext");
 
                                results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(ports[i]->bind_port)+
-                                       " (" + ports[i]->type + ", " + ports[i]->hook + ")");
+                                       " (" + type + ", " + hook + ")");
                        }
                }
                break;
@@ -98,7 +100,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                case 'P':
                {
                        int idx = 0;
-                       for (user_hash::iterator i = this->Users->clientlist->begin(); i != this->Users->clientlist->end(); i++)
+                       for (user_hash::iterator i = this->Users->clientlist->begin(); i != this->Users->clientlist->end(); i++)
                        {
                                if (IS_OPER(i->second) && !this->ULine(i->second->server))
                                {
@@ -140,7 +142,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                                if (i->second->use_count)
                                {
                                        /* RPL_STATSCOMMANDS */
-                                       results.push_back(sn+" 212 "+user->nick+" "+i->second->command+" "+ConvToStr(i->second->use_count)+" "+ConvToStr(i->second->total_bytes));
+                                       results.push_back(sn+" 212 "+user->nick+" "+i->second->name+" "+ConvToStr(i->second->use_count)+" "+ConvToStr(i->second->total_bytes));
                                }
                        }
                break;
@@ -148,7 +150,6 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                /* stats z (debug and memory info) */
                case 'z':
                {
-                       results.push_back(sn+" 240 "+user->nick+" :InspIRCd: "+ConvToStr(sizeof(InspIRCd))+" bytes");
                        results.push_back(sn+" 249 "+user->nick+" :Users: "+ConvToStr(this->Users->clientlist->size()));
                        results.push_back(sn+" 249 "+user->nick+" :Channels: "+ConvToStr(this->chanlist->size()));
                        results.push_back(sn+" 249 "+user->nick+" :Commands: "+ConvToStr(this->Parser->cmdlist.size()));
@@ -165,8 +166,6 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                                }
                        }
 
-                       results.push_back(sn+" 249 "+user->nick+" :MOTD "+ConvToStr(this->Config->MOTD.size())+", RULES "+ConvToStr(this->Config->RULES.size()));
-
                        float kbitpersec_in, kbitpersec_out, kbitpersec_total;
                        char kbitpersec_in_s[30], kbitpersec_out_s[30], kbitpersec_total_s[30];
 
@@ -234,33 +233,34 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 
                /* stats o */
                case 'o':
-                       for (int i = 0;; i++)
+               {
+                       ConfigTagList tags = ServerInstance->Config->ConfTags("oper");
+                       for(ConfigIter i = tags.first; i != tags.second; ++i)
                        {
-                               ConfigTag* tag = Config->ConfValue("oper", i);
-                               if (!tag)
-                                       break;
+                               ConfigTag* tag = i->second;
                                results.push_back(sn+" 243 "+user->nick+" O "+tag->getString("host")+" * "+
                                        tag->getString("name") + " " + tag->getString("type")+" 0");
                        }
+               }
                break;
 
                /* stats l (show user I/O stats) */
                case 'l':
                        results.push_back(sn+" 211 "+user->nick+" :nick[ident@host] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-                       for (std::vector<User*>::iterator n = this->Users->local_users.begin(); n != this->Users->local_users.end(); n++)
+                       for (std::vector<LocalUser*>::iterator n = this->Users->local_users.begin(); n != this->Users->local_users.end(); n++)
                        {
-                               User* i = *n;
-                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->getSendQSize())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(this->Time() - i->age));
+                               LocalUser* i = *n;
+                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->eh.getSendQSize())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(this->Time() - i->age));
                        }
                break;
 
        /* stats L (show user I/O stats with IP addresses) */
                case 'L':
                        results.push_back(sn+" 211 "+user->nick+" :nick[ident@ip] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-                       for (std::vector<User*>::iterator n = this->Users->local_users.begin(); n != this->Users->local_users.end(); n++)
+                       for (std::vector<LocalUser*>::iterator n = this->Users->local_users.begin(); n != this->Users->local_users.end(); n++)
                        {
-                               User* i = *n;
-                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->getSendQSize())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(this->Time() - i->age));
+                               LocalUser* i = *n;
+                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->eh.getSendQSize())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(this->Time() - i->age));
                        }
                break;