X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fijoin.cpp;h=78e05db93fbb841090e5c18257bcdf9ecd42a2f7;hb=6fe1f4e1136f2ab95a88e68af1894bf6002d03f4;hp=8342e9d2404c870d2a2886ff457e718bcfff65bf;hpb=b14ebbccf08ec34a73e1ba271e67da80d9fe805c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp
index 8342e9d24..78e05db93 100644
--- 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::Handle(User* user, std::vector<std::string>& params)
+CmdResult CommandIJoin::HandleRemote(RemoteUser* user, std::vector<std::string>& params)
 {
 	Channel* chan = ServerInstance->FindChan(params[0]);
 	if (!chan)
@@ -32,38 +32,32 @@ CmdResult CommandIJoin::Handle(User* user, std::vector<std::string>& params)
 		// Ignore the join and send RESYNC, this will result in the remote server sending all channel data to us
 		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Received IJOIN for non-existant channel: " + params[0]);
 
-		parameterlist p;
-		p.push_back(params[0]);
-		Utils->DoOneToOne(ServerInstance->Config->GetSID(), "RESYNC", p, user->server);
+		CmdBuilder("RESYNC").push(params[0]).Unicast(user);
 
 		return CMD_FAILURE;
 	}
 
 	bool apply_modes;
-	if (params.size() > 1)
+	if (params.size() > 2)
 	{
-		time_t RemoteTS = ConvToInt(params[1]);
-		if (!RemoteTS)
-		{
-			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Invalid TS in IJOIN: " + params[1]);
-			return CMD_INVALID;
-		}
-
+		time_t RemoteTS = ServerCommand::ExtractTS(params[2]);
 		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));
+			throw ProtocolException("Attempted to lower TS via IJOIN. LocalTS=" + ConvToStr(chan->age));
+		apply_modes = ((params.size() > 3) && (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::Handle(User* user, std::vector<std::string>& params)
+CmdResult CommandResync::HandleServer(TreeServer* server, std::vector<std::string>& params)
 {
 	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Resyncing " + params[0]);
 	Channel* chan = ServerInstance->FindChan(params[0]);
@@ -74,18 +68,10 @@ CmdResult CommandResync::Handle(User* user, std::vector<std::string>& params)
 		return CMD_FAILURE;
 	}
 
-	TreeServer* server = Utils->FindServer(user->server);
-	if (!server)
-		return CMD_FAILURE;
-
-	TreeSocket* socket = server->GetSocket();
-	if (!socket)
-	{
-		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Received RESYNC with a source that is not directly connected: " + user->uuid);
-		return CMD_INVALID;
-	}
+	if (!server->IsLocal())
+		throw ProtocolException("RESYNC from a server that is not directly connected");
 
 	// Send all known information about the channel
-	socket->SyncChannel(chan);
+	server->GetSocket()->SyncChannel(chan);
 	return CMD_SUCCESS;
 }