Introduce ModeProcessFlags, can be passed to ModeParser::Process() to indicate local...

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

diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp
index 97cc44b6fff28224d097166c3e1d1d9c5570c900..badcc340162ed1f09645745ee8ec1637bc522463 100644 (file)
--- a/src/modules/m_spanningtree/ping.cpp
+++ b/src/modules/m_spanningtree/ping.cpp
@@ -18,44 +18,34 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
 
-#include "main.h"
 #include "utils.h"
-#include "treeserver.h"
 #include "treesocket.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+/* $ModDep: m_spanningtree/utils.h m_spanningtree/treesocket.h */
 
 bool TreeSocket::LocalPing(const std::string &prefix, parameterlist &params)
 {
        if (params.size() < 1)
                return true;
-       if (params.size() == 1)
+
+       const std::string& forwardto = params[0];
+       if (forwardto == ServerInstance->Config->GetSID())
        {
-               std::string stufftobounce = params[0];
-               this->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" PONG "+stufftobounce);
-               return true;
+               // PING for us, reply with a PONG
+               std::string reply = ":" + forwardto + " PONG " + prefix;
+               if (params.size() >= 2)
+                       // If there is a second parameter, append it
+                       reply.append(" :").append(params[1]);
+
+               this->WriteLine(reply);
        }
        else
        {
-               std::string forwardto = params[1];
-               if (forwardto == ServerInstance->Config->ServerName || forwardto == ServerInstance->Config->GetSID())
-               {
-                       // this is a ping for us, send back PONG to the requesting server
-                       params[1] = params[0];
-                       params[0] = forwardto;
-                       Utils->DoOneToOne(ServerInstance->Config->GetSID(),"PONG",params,params[1]);
-               }
-               else
-               {
-                       // not for us, pass it on :)
-                       Utils->DoOneToOne(prefix,"PING",params,forwardto);
-               }
-               return true;
+               // not for us, pass it on :)
+               Utils->DoOneToOne(prefix,"PING",params,forwardto);
        }
+       return true;
 }