X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffjoin.cpp;h=41212b5176d8a91d56ad39f7871ff3dd299bb2fb;hb=afefc6bfe9e184086247fc305a41ef1c21cb136b;hp=e29aa09d7ae5d9aa0c5fce8f59656dcd24c3707b;hpb=6fe1f4e1136f2ab95a88e68af1894bf6002d03f4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index e29aa09d7..41212b517 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -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
@@ -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)
 	{
@@ -134,6 +138,14 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 			/* 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)
@@ -152,7 +164,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 		}
 	}
 
-	/* First up, apply their channel modes if they won the TS war */
+	// Apply their channel modes if we have to
 	Modes::ChangeList modechangelist;
 	if (apply_other_sides_modes)
 	{
@@ -162,13 +174,11 @@ 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);
 
-	/* Now, process every 'modes,uuid' pair */
+	// Process every member in the message
 	irc::tokenstream users(params.back());
 	std::string item;
 	Modes::ChangeList* modechangelistptr = (apply_other_sides_modes ? &modechangelist : NULL);
@@ -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)
@@ -256,10 +266,7 @@ void CommandFJoin::RemoveStatus(Channel* c)
 	{
 		ModeHandler* mh = i->second;
 
-		/* Passing a pointer to a modestacker here causes the mode to be put onto the mode stack,
-		 * rather than applied immediately. Module unloads require this to be done immediately,
-		 * for this function we require tidyness instead. Fixes bug #493
-		 */
+		// Add the removal of this mode to the changelist. This handles all kinds of modes, including prefix modes.
 		mh->RemoveMode(c, changelist);
 	}
 
@@ -269,29 +276,21 @@ void CommandFJoin::RemoveStatus(Channel* c)
 void CommandFJoin::LowerTS(Channel* chan, time_t TS, const std::string& newname)
 {
 	if (Utils->AnnounceTSChange)
-		chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name.c_str(), newname.c_str(), (unsigned long) chan->age, (unsigned long) TS);
+		chan->WriteNotice(InspIRCd::Format("TS for %s changed from %lu to %lu", newname.c_str(), (unsigned long) chan->age, (unsigned long) TS));
 
 	// While the name is equal in case-insensitive compare, it might differ in case; use the remote version
 	chan->name = newname;
 	chan->age = TS;
 
-	// Remove all pending invites
-	chan->ClearInvites();
-
 	// Clear all modes
 	CommandFJoin::RemoveStatus(chan);
 
 	// Unset all extensions
 	chan->FreeAllExtItems();
 
-	// Clear the topic, if it isn't empty then send a topic change message to local users
-	if (!chan->topic.empty())
-	{
-		chan->topic.clear();
-		chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :", chan->name.c_str());
-	}
+	// Clear the topic
+	chan->SetTopic(ServerInstance->FakeClient, std::string(), 0);
 	chan->setby.clear();
-	chan->topicset = 0;
 }
 
 CommandFJoin::Builder::Builder(Channel* chan, TreeServer* source)