Remove spanningtree override of /LUSERS

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / override_stats.cpp

diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp
index 76522a3dd0c93e561ebe1095e157943430f49207..f43aa8d3b3116c1d58043b23f96771ff0961e4dc 100644 (file)
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -14,11 +14,8 @@
 /* $ModDesc: Provides a spanning tree server link protocol */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 
 #include "main.h"
 #include "utils.h"
@@ -28,12 +25,12 @@
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 
-int ModuleSpanningTree::HandleStats(const std::vector<std::string>& parameters, User* user)
+ModResult ModuleSpanningTree::HandleStats(const std::vector<std::string>& parameters, User* user)
 {
        if (parameters.size() > 1)
        {
                if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[1]))
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                /* Remote STATS, the server is within the 2nd parameter */
                parameterlist params;
@@ -51,42 +48,23 @@ int ModuleSpanningTree::HandleStats(const std::vector<std::string>& parameters,
                {
                        user->WriteServ( "402 %s %s :No such server", user->nick.c_str(), parameters[1].c_str());
                }
-               return 1;
+               return MOD_RES_DENY;
        }
-       return 0;
+       return MOD_RES_PASSTHRU;
 }
 
-int ModuleSpanningTree::OnStats(char statschar, User* user, string_list &results)
+ModResult ModuleSpanningTree::OnStats(char statschar, User* user, string_list &results)
 {
        if ((statschar == 'c') || (statschar == 'n'))
        {
                for (unsigned int i = 0; i < Utils->LinkBlocks.size(); i++)
                {
-                       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].Hook.empty() ? "plaintext" : Utils->LinkBlocks[i].Hook)+" "+(Utils->LinkBlocks[i].AutoConnect ? 'a': '-')+'s');
+                       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]->Hook.empty() ? "plaintext" : Utils->LinkBlocks[i]->Hook));
                        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)+" 244 "+user->nick+" H * * "+Utils->LinkBlocks[i]->Name.c_str());
                }
-               return 1;
+               return MOD_RES_DENY;
        }
-
-       if (statschar == 'p')
-       {
-               /* show all server ports, after showing client ports. -- w00t */
-
-               for (unsigned int i = 0; i < Utils->Bindings.size(); i++)
-               {
-                       std::string ip = Utils->Bindings[i]->GetIP();
-                       if (ip.empty())
-                               ip = "*";
-
-                       std::string transport("plaintext");
-                       if (Utils->Bindings[i]->GetIOHook())
-                               transport = BufferedSocketNameRequest(this, Utils->Bindings[i]->GetIOHook()).Send();
-
-                       results.push_back(ConvToStr(ServerInstance->Config->ServerName) + " 249 "+user->nick+" :" + ip + ":" + ConvToStr(Utils->Bindings[i]->GetPort())+
-                               " (server, " + transport + ")");
-               }
-       }
-       return 0;
+       return MOD_RES_PASSTHRU;
 }