m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

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

diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp
index 2f71ffe27be546eb94a018d51c642d5d81805972..8342e9d2404c870d2a2886ff457e718bcfff65bf 100644 (file)
--- a/src/modules/m_spanningtree/ijoin.cpp
+++ b/src/modules/m_spanningtree/ijoin.cpp
@@ -23,18 +23,17 @@
 #include "treeserver.h"
 #include "treesocket.h"
 
-CmdResult CommandIJoin::HandleRemote(const std::vector<std::string>& params, RemoteUser* user)
+CmdResult CommandIJoin::Handle(User* user, std::vector<std::string>& params)
 {
        Channel* chan = ServerInstance->FindChan(params[0]);
        if (!chan)
        {
                // Desync detected, recover
                // Ignore the join and send RESYNC, this will result in the remote server sending all channel data to us
-               ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "Received IJOIN for non-existant channel: " + params[0]);
+               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Received IJOIN for non-existant channel: " + params[0]);
 
                parameterlist p;
                p.push_back(params[0]);
-               SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
                Utils->DoOneToOne(ServerInstance->Config->GetSID(), "RESYNC", p, user->server);
 
                return CMD_FAILURE;
@@ -46,13 +45,13 @@ CmdResult CommandIJoin::HandleRemote(const std::vector<std::string>& params, Rem
                time_t RemoteTS = ConvToInt(params[1]);
                if (!RemoteTS)
                {
-                       ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Invalid TS in IJOIN: " + params[1]);
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Invalid TS in IJOIN: " + params[1]);
                        return CMD_INVALID;
                }
 
                if (RemoteTS < chan->age)
                {
-                       ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Attempted to lower TS via IJOIN. Channel=" + params[0] + " RemoteTS=" + params[1] + " LocalTS=" + ConvToStr(chan->age));
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Attempted to lower TS via IJOIN. Channel=" + params[0] + " RemoteTS=" + params[1] + " LocalTS=" + ConvToStr(chan->age));
                        return CMD_INVALID;
                }
                apply_modes = ((params.size() > 2) && (RemoteTS == chan->age));
@@ -64,18 +63,17 @@ CmdResult CommandIJoin::HandleRemote(const std::vector<std::string>& params, Rem
        return CMD_SUCCESS;
 }
 
-CmdResult CommandResync::HandleServer(const std::vector<std::string>& params, FakeUser* user)
+CmdResult CommandResync::Handle(User* user, std::vector<std::string>& params)
 {
-       ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "Resyncing " + params[0]);
+       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Resyncing " + params[0]);
        Channel* chan = ServerInstance->FindChan(params[0]);
        if (!chan)
        {
                // This can happen for a number of reasons, safe to ignore
-               ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "Channel does not exist");
+               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Channel does not exist");
                return CMD_FAILURE;
        }
 
-       SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
        TreeServer* server = Utils->FindServer(user->server);
        if (!server)
                return CMD_FAILURE;
@@ -83,7 +81,7 @@ CmdResult CommandResync::HandleServer(const std::vector<std::string>& params, Fa
        TreeSocket* socket = server->GetSocket();
        if (!socket)
        {
-               ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Received RESYNC with a source that is not directly connected: " + user->uuid);
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Received RESYNC with a source that is not directly connected: " + user->uuid);
                return CMD_INVALID;
        }