Merge branch 'master+stfjoinforward'

3 files changed, 111 insertions, 16 deletions

diff --git a/src/modules/m_spanningtree/commandbuilder.h b/src/modules/m_spanningtree/commandbuilder.h
index c2b438deb..26eb4587f 100644
--- a/src/modules/m_spanningtree/commandbuilder.h
+++ b/src/modules/m_spanningtree/commandbuilder.h
@@ -75,6 +75,13 @@ class CmdBuilder
 		return *this;
 	}
 
+	template <typename InputIterator>
+	CmdBuilder& push_raw(InputIterator first, InputIterator last)
+	{
+		content.append(first, last);
+		return *this;
+	}
+
 	CmdBuilder& push(const std::string& s)
 	{
 		content.push_back(' ');
diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 89bd2bfee..1f7456426 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -114,6 +114,7 @@ class CommandOpertype : public UserOnlyServerCommand<CommandOpertype>
 };
 
 class TreeSocket;
+class FwdFJoinBuilder;
 class CommandFJoin : public ServerCommand
 {
 	/** Remove all modes from a channel, including statusmodes (+qaovh etc), simplemodes, parameter modes.
@@ -129,10 +130,11 @@ class CommandFJoin : public ServerCommand
 	 * @param newname The new name of the channel; must be the same or a case change of the current name
 	 */
 	static void LowerTS(Channel* chan, time_t TS, const std::string& newname);
-	void ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, Modes::ChangeList* modechangelist);
+	void ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, Modes::ChangeList* modechangelist, FwdFJoinBuilder& fwdfjoin);
  public:
 	CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { }
 	CmdResult Handle(User* user, std::vector<std::string>& params);
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_LOCALONLY; }
 
 	class Builder : public CmdBuilder
 	{
@@ -140,13 +142,25 @@ class CommandFJoin : public ServerCommand
 		 * a message or not
 		 */
 		static const size_t membid_max_digits = 20;
-		static const size_t maxline = 480;
+		static const size_t maxline = 510;
 		std::string::size_type pos;
 
+	protected:
+		void add(Membership* memb, std::string::const_iterator mbegin, std::string::const_iterator mend);
+		bool has_room(std::string::size_type nummodes) const;
+
 	 public:
-		Builder(Channel* chan);
-		void add(Membership* memb);
-		bool has_room(Membership* memb) const;
+		Builder(Channel* chan, TreeServer* source = Utils->TreeRoot);
+		void add(Membership* memb)
+		{
+			add(memb, memb->modes.begin(), memb->modes.end());
+		}
+
+		bool has_room(Membership* memb) const
+		{
+			return has_room(memb->modes.size());
+		}
+
 		void clear();
 		const std::string& finalize();
 	};
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index bfe3592d2..25c1f6678 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -25,6 +25,22 @@
 #include "treeserver.h"
 #include "treesocket.h"
 
+/** FJOIN builder for rebuilding incoming FJOINs and splitting them up into multiple messages if necessary
+ */
+class FwdFJoinBuilder : public CommandFJoin::Builder
+{
+	TreeServer* const sourceserver;
+
+ public:
+	FwdFJoinBuilder(Channel* chan, TreeServer* server)
+		: CommandFJoin::Builder(chan, server)
+		, sourceserver(server)
+	{
+	}
+
+	void add(Membership* memb, std::string::const_iterator mbegin, std::string::const_iterator mend);
+};
+
 /** FJOIN, almost identical to TS6 SJOIN, except for nicklist handling. */
 CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 {
@@ -72,6 +88,30 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 	 * <membid> is a positive integer representing the id of the membership.
 	 * If not present (in FJOINs coming from pre-1205 servers), 0 is assumed.
 	 *
+	 * Forwarding:
+	 * FJOIN messages are forwarded with the new TS and modes. Prefix modes of
+	 * members on the losing side are not forwarded.
+	 * This is required to only have one server on each side of the network who
+	 * decides the fate of a channel during a network merge. Otherwise, if the
+	 * clock of a server is slightly off it may make a different decision than
+	 * the rest of the network and desync.
+	 * The prefix modes are always forwarded as-is, or not at all.
+	 * One incoming FJOIN may result in more than one FJOIN being generated
+	 * and forwarded mainly due to compatibility reasons with non-InspIRCd
+	 * servers that don't handle more than 512 char long lines.
+	 *
+	 * Forwarding examples:
+	 * Existing channel #chan with TS 1000, modes +n.
+	 * Incoming:  :220 FJOIN #chan 1000 +t :o,220AAAAAB:0
+	 * Forwarded: :220 FJOIN #chan 1000 +nt :o,220AAAAAB:0
+	 * Merge modes and forward the result. Forward their prefix modes as well.
+	 *
+	 * Existing channel #chan with TS 1000, modes +nt.
+	 * Incoming:  :220 FJOIN #CHAN 2000 +i :ov,220AAAAAB:0 o,220AAAAAC:20
+	 * Forwarded: :220 FJOIN #chan 1000 +nt :,220AAAAAB:0 ,220AAAAAC:20
+	 * Drop their modes, forward our modes and TS, use our channel name
+	 * capitalization. Don't forward prefix modes.
+	 *
 	 */
 
 	time_t TS = ServerCommand::ExtractTS(params[1]);
@@ -124,15 +164,22 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 
 	TreeServer* const sourceserver = TreeServer::Get(srcuser);
 
+	// Build a new FJOIN for forwarding. Put the correct TS in it and the current modes of the channel
+	// after applying theirs. If they lost, the prefix modes from their message are not forwarded.
+	FwdFJoinBuilder fwdfjoin(chan, sourceserver);
+
 	/* Now, process every 'modes,uuid' pair */
 	irc::tokenstream users(params.back());
 	std::string item;
 	Modes::ChangeList* modechangelistptr = (apply_other_sides_modes ? &modechangelist : NULL);
 	while (users.GetToken(item))
 	{
-		ProcessModeUUIDPair(item, sourceserver, chan, modechangelistptr);
+		ProcessModeUUIDPair(item, sourceserver, chan, modechangelistptr, fwdfjoin);
 	}
 
+	fwdfjoin.finalize();
+	fwdfjoin.Forward(sourceserver);
+
 	// Set prefix modes on their users if we lost the FJOIN or had equal TS
 	if (apply_other_sides_modes)
 		ServerInstance->Modes->Process(srcuser, chan, NULL, modechangelist, ModeParser::MODE_LOCALONLY);
@@ -140,7 +187,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 	return CMD_SUCCESS;
 }
 
-void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, Modes::ChangeList* modechangelist)
+void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, Modes::ChangeList* modechangelist, FwdFJoinBuilder& fwdfjoin)
 {
 	std::string::size_type comma = item.find(',');
 
@@ -162,12 +209,13 @@ void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sour
 		return;
 	}
 
+	std::string::const_iterator modeendit = item.begin(); // End of the "ov" mode string
 	/* Check if the user received at least one mode */
-	if ((modechangelist) && (comma > 0) && (comma != std::string::npos))
+	if ((modechangelist) && (comma != std::string::npos))
 	{
+		modeendit += comma;
 		/* Iterate through the modes and see if they are valid here, if so, apply */
-		std::string::const_iterator commait = item.begin()+comma;
-		for (std::string::const_iterator i = item.begin(); i != commait; ++i)
+		for (std::string::const_iterator i = item.begin(); i != modeendit; ++i)
 		{
 			ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
 			if (!mh)
@@ -180,7 +228,13 @@ void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sour
 
 	Membership* memb = chan->ForceJoin(who, NULL, sourceserver->IsBursting());
 	if (!memb)
+	{
+		// User was already on the channel, forward because of the modes they potentially got
+		memb = chan->GetUser(who);
+		if (memb)
+			fwdfjoin.add(memb, item.begin(), modeendit);
 		return;
+	}
 
 	// Assign the id to the new Membership
 	Membership::Id membid = 0;
@@ -188,6 +242,9 @@ void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sour
 	if (colon != std::string::npos)
 		membid = Membership::IdFromString(item.substr(colon+1));
 	memb->id = membid;
+
+	// Add member to fwdfjoin with prefix modes
+	fwdfjoin.add(memb, item.begin(), modeendit);
 }
 
 void CommandFJoin::RemoveStatus(Channel* c)
@@ -237,24 +294,24 @@ void CommandFJoin::LowerTS(Channel* chan, time_t TS, const std::string& newname)
 	chan->topicset = 0;
 }
 
-CommandFJoin::Builder::Builder(Channel* chan)
-	: CmdBuilder("FJOIN")
+CommandFJoin::Builder::Builder(Channel* chan, TreeServer* source)
+	: CmdBuilder(source->GetID(), "FJOIN")
 {
 	push(chan->name).push_int(chan->age).push_raw(" +");
 	pos = str().size();
 	push_raw(chan->ChanModes(true)).push_raw(" :");
 }
 
-void CommandFJoin::Builder::add(Membership* memb)
+void CommandFJoin::Builder::add(Membership* memb, std::string::const_iterator mbegin, std::string::const_iterator mend)
 {
-	push_raw(memb->modes).push_raw(',').push_raw(memb->user->uuid);
+	push_raw(mbegin, mend).push_raw(',').push_raw(memb->user->uuid);
 	push_raw(':').push_raw_int(memb->id);
 	push_raw(' ');
 }
 
-bool CommandFJoin::Builder::has_room(Membership* memb) const
+bool CommandFJoin::Builder::has_room(std::string::size_type nummodes) const
 {
-	return ((str().size() + memb->modes.size() + UIDGenerator::UUID_LENGTH + 2 + membid_max_digits + 1) <= maxline);
+	return ((str().size() + nummodes + UIDGenerator::UUID_LENGTH + 2 + membid_max_digits + 1) <= maxline);
 }
 
 void CommandFJoin::Builder::clear()
@@ -269,3 +326,20 @@ const std::string& CommandFJoin::Builder::finalize()
 		content.erase(content.size()-1);
 	return str();
 }
+
+void FwdFJoinBuilder::add(Membership* memb, std::string::const_iterator mbegin, std::string::const_iterator mend)
+{
+	// Pseudoserver compatibility:
+	// Some pseudoservers do not handle lines longer than 512 so we split long FJOINs into multiple messages.
+	// The forwarded FJOIN can end up being longer than the original one if we have more modes set and won, for example.
+
+	// Check if the member fits into the current message. If not, send it and prepare a new one.
+	if (!has_room(std::distance(mbegin, mend)))
+	{
+		finalize();
+		Forward(sourceserver);
+		clear();
+	}
+	// Add the member and their modes exactly as they sent them
+	CommandFJoin::Builder::add(memb, mbegin, mend);
+}