Merge insp20

[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..14b3f5ef74b10a6936eb26d9859d4eb6c78421db 100644 (file)
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -1,92 +1,52 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *       the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $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"
-#include "treeserver.h"
 #include "link.h"
-#include "treesocket.h"
-
-/* $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)
-{
-       if (parameters.size() > 1)
-       {
-               if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[1]))
-                       return 0;
-
-               /* Remote STATS, the server is within the 2nd parameter */
-               parameterlist params;
-               params.push_back(parameters[0]);
-               params.push_back(parameters[1]);
-               /* Send it out remotely, generate no reply yet */
-
-               TreeServer* s = Utils->FindServerMask(parameters[1]);
-               if (s)
-               {
-                       params[1] = s->GetName();
-                       Utils->DoOneToOne(user->uuid, "STATS", params, s->GetName());
-               }
-               else
-               {
-                       user->WriteServ( "402 %s %s :No such server", user->nick.c_str(), parameters[1].c_str());
-               }
-               return 1;
-       }
-       return 0;
-}
 
-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++)
+               for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i != Utils->LinkBlocks.end(); ++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');
+                       Link* L = *i;
+                       results.push_back("213 "+user->nick+" "+statschar+" *@"+(L->HiddenFromStats ? "<hidden>" : L->IPAddr)+" * "+(*i)->Name.c_str()+" "+ConvToStr(L->Port)+" "+(L->Hook.empty() ? "plaintext" : L->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("244 "+user->nick+" H * * "+L->Name.c_str());
                }
-               return 1;
+               return MOD_RES_DENY;
        }
-
-       if (statschar == 'p')
+       else if (statschar == 'U')
        {
-               /* show all server ports, after showing client ports. -- w00t */
-
-               for (unsigned int i = 0; i < Utils->Bindings.size(); i++)
+               ConfigTagList tags = ServerInstance->Config->ConfTags("uline");
+               for (ConfigIter i = tags.first; i != tags.second; ++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 + ")");
+                       std::string name = i->second->getString("server");
+                       if (!name.empty())
+                               results.push_back("248 "+user->nick+" U "+name);
                }
+               return MOD_RES_DENY;
        }
-       return 0;
+       return MOD_RES_PASSTHRU;
 }
-