X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffjoin.cpp;h=6305e5af8536c34cdc98651e3e7f706ee3e8024e;hb=9cf381330eab69d7e5bf26684d1ec8075aee60a2;hp=40ba5e893e43eb15d876c906356c869fc489ecd2;hpb=2706a993b3f8ee52e2728047fad6a56f7e3cf405;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 40ba5e893..6305e5af8 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -42,7 +42,7 @@ class FwdFJoinBuilder : public CommandFJoin::Builder
 };
 
 /** FJOIN, almost identical to TS6 SJOIN, except for nicklist handling. */
-CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
+CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
 {
 	/* 1.1+ FJOIN works as follows:
 	 *
@@ -70,6 +70,9 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 	 * losing side, so only its own modes get applied. Life is simple for those
 	 * who succeed at internets. :-)
 	 *
+	 * Outside of netbursts, the winning side also resyncs the losing side if it
+	 * detects that the other side recreated the channel.
+	 *
 	 * Syntax:
 	 * :<sid> FJOIN <chan> <TS> <modes> :[<member> [<member> ...]]
 	 * The last parameter is a list consisting of zero or more channel members
@@ -82,7 +85,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 	 * drop the link to avoid desync.
 	 *
 	 * InspIRCd 2.0 and older required a comma before the uuid even if the user
-	 * had no prefix modes on the channel, InspIRCd 2.2 and later does not require
+	 * had no prefix modes on the channel, InspIRCd 3.0 and later does not require
 	 * a comma in this case anymore.
 	 *
 	 * <membid> is a positive integer representing the id of the membership.
@@ -119,6 +122,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 	const std::string& channel = params[0];
 	Channel* chan = ServerInstance->FindChan(channel);
 	bool apply_other_sides_modes = true;
+	TreeServer* const sourceserver = TreeServer::Get(srcuser);
 
 	if (!chan)
 	{
@@ -129,11 +133,19 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 		time_t ourTS = chan->age;
 		if (TS != ourTS)
 		{
-			ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %ld",
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %ld",
 				chan->name.c_str(), (unsigned long)ourTS, (unsigned long)TS, (long)(ourTS - TS));
 			/* If our TS is less than theirs, we dont accept their modes */
 			if (ourTS < TS)
 			{
+				// If the source server isn't bursting then this FJOIN is the result of them recreating the channel with a higher TS.
+				// This happens if the last user on the channel hops and before the PART propagates a user on another server joins. Fix it by doing a resync.
+				// Servers behind us won't react this way because the forwarded FJOIN will have the correct TS.
+				if (!sourceserver->IsBursting())
+				{
+					ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Server %s recreated channel %s with higher TS, resyncing", sourceserver->GetName().c_str(), chan->name.c_str());
+					sourceserver->GetSocket()->SyncChannel(chan);
+				}
 				apply_other_sides_modes = false;
 			}
 			else if (ourTS > TS)
@@ -162,14 +174,12 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 		modechangelist.clear();
 	}
 
-	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);
 
 	// Process every member in the message
-	irc::tokenstream users(params.back());
+	irc::spacesepstream users(params.back());
 	std::string item;
 	Modes::ChangeList* modechangelistptr = (apply_other_sides_modes ? &modechangelist : NULL);
 	while (users.GetToken(item))
@@ -178,7 +188,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 	}
 
 	fwdfjoin.finalize();
-	fwdfjoin.Forward(sourceserver);
+	fwdfjoin.Forward(sourceserver->GetRoute());
 
 	// Set prefix modes on their users if we lost the FJOIN or had equal TS
 	if (apply_other_sides_modes)
@@ -266,7 +276,8 @@ void CommandFJoin::RemoveStatus(Channel* c)
 void CommandFJoin::LowerTS(Channel* chan, time_t TS, const std::string& newname)
 {
 	if (Utils->AnnounceTSChange)
-		chan->WriteNotice(InspIRCd::Format("TS for %s changed from %lu to %lu", newname.c_str(), (unsigned long) chan->age, (unsigned long) TS));
+		chan->WriteNotice(InspIRCd::Format("Creation time of %s changed from %s to %s", newname.c_str(),
+			InspIRCd::TimeString(chan->age).c_str(), InspIRCd::TimeString(TS).c_str()));
 
 	// While the name is equal in case-insensitive compare, it might differ in case; use the remote version
 	chan->name = newname;
@@ -284,7 +295,7 @@ void CommandFJoin::LowerTS(Channel* chan, time_t TS, const std::string& newname)
 }
 
 CommandFJoin::Builder::Builder(Channel* chan, TreeServer* source)
-	: CmdBuilder(source->GetID(), "FJOIN")
+	: CmdBuilder(source, "FJOIN")
 {
 	push(chan->name).push_int(chan->age).push_raw(" +");
 	pos = str().size();