Make STATS i, y, c, n more relevent to 1.1

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5756 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index f82834229511cee984051f647a78837a1e35bbc9..70cbcf2aef73cdd2e65194f09b7b4bd85e030577 100644 (file)
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -79,6 +79,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                }
                break;
 
                }
                break;
 

+               case 'n':

                case 'c':
                {
                        /* This stats symbol must be handled by a linking module */
                case 'c':
                {
                        /* This stats symbol must be handled by a linking module */


@@ -90,7 +91,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                        int idx = 0;
                        for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                        {
                        int idx = 0;
                        for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                        {

-                               results.push_back(sn+" 215 "+user->nick+" I * * * "+ConvToStr(MAXCLIENTS)+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");
+                               results.push_back(sn+" 215 "+user->nick+" I NOMATCH * "+i->host+" "+ConvToStr(MAXCLIENTS)+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");

                                idx++;
                        }
                }
                                idx++;
                        }
                }


@@ -101,7 +102,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                        int idx = 0;
                        for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                        {
                        int idx = 0;
                        for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                        {

-                               results.push_back(sn+" 218 "+user->nick+" Y "+ConvToStr(idx)+" 120 0 "+ConvToStr(i->flood)+" "+ConvToStr(i->registration_timeout));
+                               results.push_back(sn+" 218 "+user->nick+" Y "+ConvToStr(idx)+" "+ConvToStr(i->pingtime)+" 0 "+ConvToStr(i->sendqmax)+" :"+ConvToStr(i->flood)+" "+ConvToStr(i->registration_timeout));

                                idx++;
                        }
                }
                                idx++;
                        }
                }

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index ae68115c5074a61c6c9c0b97663707fb696f3bc7..a8665350cd3c7b785965e6731a5c40bd7138bde5 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -4623,12 +4623,13 @@ class ModuleSpanningTree : public Module
 
        virtual int OnStats(char statschar, userrec* user, string_list &results)
        {
 
        virtual int OnStats(char statschar, userrec* user, string_list &results)
        {

-               if (statschar == 'c')
+               if ((statschar == 'c') || (statschar == 'n'))

                {
                        for (unsigned int i = 0; i < Utils->LinkBlocks.size(); i++)
                        {
                {
                        for (unsigned int i = 0; i < Utils->LinkBlocks.size(); i++)
                        {

-                               results.push_back(std::string(ServerInstance->Config->ServerName)+" 213 "+user->nick+" C *@"+(Utils->LinkBlocks[i].HiddenFromStats ? "<hidden>" : Utils->LinkBlocks[i].IPAddr)+" * "+Utils->LinkBlocks[i].Name.c_str()+" "+ConvToStr(Utils->LinkBlocks[i].Port)+" "+(Utils->LinkBlocks[i].EncryptionKey != "" ? 'e' : '-')+(Utils->LinkBlocks[i].AutoConnect ? 'a' : '-')+'s');
-                               results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+Utils->LinkBlocks[i].Name.c_str());
+                               results.push_back(std::string(ServerInstance->Config->ServerName)+" 213 "+user->nick+" "+statschar+" *@"+(Utils->LinkBlocks[i].HiddenFromStats ? "<hidden>" : Utils->LinkBlocks[i].IPAddr)+" * "+Utils->LinkBlocks[i].Name.c_str()+" "+ConvToStr(Utils->LinkBlocks[i].Port)+" "+(Utils->LinkBlocks[i].EncryptionKey != "" ? 'e' : '-')+(Utils->LinkBlocks[i].AutoConnect ? 'a' : '-')+'s');
+                               if (statschar == 'c')
+                                       results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+Utils->LinkBlocks[i].Name.c_str());

                        }
                        results.push_back(std::string(ServerInstance->Config->ServerName)+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
                        ServerInstance->SNO->WriteToSnoMask('t',"Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
                        }
                        results.push_back(std::string(ServerInstance->Config->ServerName)+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
                        ServerInstance->SNO->WriteToSnoMask('t',"Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);