Merge branch 'insp20' into master.

[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 a579848c8321061add6f900862e7eed061ea5e82..d33ef3d4ed2550ef01e8c76e20bc05b0412c18e4 100644 (file)
--- a/src/modules/m_spanningtree/ijoin.cpp
+++ b/src/modules/m_spanningtree/ijoin.cpp
@@ -23,7 +23,7 @@
 #include "treeserver.h"
 #include "treesocket.h"
 
-CmdResult CommandIJoin::HandleRemote(RemoteUser* user, std::vector<std::string>& params)
+CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params)
 {
        Channel* chan = ServerInstance->FindChan(params[0]);
        if (!chan)
@@ -38,30 +38,24 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, std::vector<std::string>&
        }
 
        bool apply_modes;
-       if (params.size() > 1)
+       if (params.size() > 3)
        {
-               time_t RemoteTS = ConvToInt(params[1]);
-               if (!RemoteTS)
-               {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Invalid TS in IJOIN: " + params[1]);
-                       return CMD_INVALID;
-               }
-
-               if (RemoteTS < 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));
+               time_t RemoteTS = ServerCommand::ExtractTS(params[2]);
+               apply_modes = (RemoteTS <= chan->age);
        }
        else
                apply_modes = false;
 
-       chan->ForceJoin(user, apply_modes ? &params[2] : NULL);
+       // Join the user and set the membership id to what they sent
+       Membership* memb = chan->ForceJoin(user, apply_modes ? &params[3] : NULL);
+       if (!memb)
+               return CMD_FAILURE;
+
+       memb->id = Membership::IdFromString(params[1]);
        return CMD_SUCCESS;
 }
 
-CmdResult CommandResync::HandleServer(TreeServer* server, std::vector<std::string>& params)
+CmdResult CommandResync::HandleServer(TreeServer* server, CommandBase::Params& params)
 {
        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Resyncing " + params[0]);
        Channel* chan = ServerInstance->FindChan(params[0]);
@@ -73,10 +67,7 @@ CmdResult CommandResync::HandleServer(TreeServer* server, std::vector<std::strin
        }
 
        if (!server->IsLocal())
-       {
-               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Received RESYNC with a source that is not directly connected: " + server->GetID());
-               return CMD_INVALID;
-       }
+               throw ProtocolException("RESYNC from a server that is not directly connected");
 
        // Send all known information about the channel
        server->GetSocket()->SyncChannel(chan);