Merge pull request #495 from SaberUK/master+fix-libcpp

[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 95167396483c5c095fd3c3bd36f8e5dee1b22eb4..badcc340162ed1f09645745ee8ec1637bc522463 100644 (file)
--- a/src/modules/m_spanningtree/ping.cpp
+++ b/src/modules/m_spanningtree/ping.cpp
@@ -28,28 +28,24 @@ 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())
        {
-               this->WriteLine(":"+ServerInstance->Config->GetSID()+" PONG "+params[0]);
-               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
        {
-               const 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;
 }