From b14ebbccf08ec34a73e1ba271e67da80d9fe805c Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Mon, 15 Jul 2013 13:40:22 +0200 Subject: m_spanningtree Move all server-to-server command handlers into handler classes These commands are not registered in or called by the core. When looking for the handler of a command a new command table is searched first which contains all server-to-server commands. If a handler cannot be found in there, the core command table is consulted. --- src/modules/m_spanningtree/ping.cpp | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'src/modules/m_spanningtree/ping.cpp') diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp index 92eee2666..537efe964 100644 --- a/src/modules/m_spanningtree/ping.cpp +++ b/src/modules/m_spanningtree/ping.cpp @@ -20,30 +20,24 @@ #include "inspircd.h" #include "utils.h" -#include "treesocket.h" +#include "treeserver.h" +#include "commands.h" +#include "utils.h" -bool TreeSocket::LocalPing(const std::string &prefix, parameterlist ¶ms) +CmdResult CommandPing::Handle(User* user, std::vector& params) { - if (params.size() < 1) - return true; - - const std::string& forwardto = params[0]; - if (forwardto == ServerInstance->Config->GetSID()) + if (params[0] == ServerInstance->Config->GetSID()) { // PING for us, reply with a PONG - std::string reply = ":" + forwardto + " PONG " + prefix; + parameterlist reply; + reply.push_back(user->uuid); if (params.size() >= 2) // If there is a second parameter, append it - reply.append(" :").append(params[1]); + reply.push_back(params[1]); - this->WriteLine(reply); - } - else - { - // not for us, pass it on :) - Utils->DoOneToOne(prefix,"PING",params,forwardto); + Utils->DoOneToOne(params[0], "PONG", reply, user->server); } - return true; + return CMD_SUCCESS; } -- cgit v1.3.1-10-gc9f91