X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffmode.cpp;h=5627b023baa62987e83ad194527f45b7170c6e90;hb=3eb205218a321e454d873ae14e2e717ce9d64142;hp=a91803384f2e8298cb70349bbb357afce86193e9;hpb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index a91803384..5627b023b 100644
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -22,13 +22,13 @@
 #include "commands.h"
 
 /** FMODE command - server mode with timestamp checks */
-CmdResult CommandFMode::Handle(const std::vector<std::string>& params, User *who)
+CmdResult CommandFMode::Handle(User* who, std::vector<std::string>& params)
 {
 	time_t TS = ConvToInt(params[1]);
 	if (!TS)
 	{
-		ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropping link.");
-		ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq, dropping link.", who->server.c_str());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropping link.");
+		ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq, dropping link.", who->server->GetName().c_str());
 		return CMD_INVALID;
 	}
 
@@ -50,28 +50,28 @@ CmdResult CommandFMode::Handle(const std::vector<std::string>& params, User *who
 			return CMD_FAILURE;
 
 		if (IS_SERVER(user))
-			return CMD_INVALID;
+			throw ProtocolException("Invalid target");
 
 		ourTS = user->age;
 	}
 
-	/* TS is equal or less: Merge the mode changes into ours and pass on.
+	/* If the TS is greater than ours, we drop the mode and don't pass it anywhere.
 	 */
-	if (TS <= ourTS)
-	{
-		std::vector<std::string> modelist;
-		modelist.reserve(params.size()-1);
-		/* Insert everything into modelist except the TS (params[1]) */
-		modelist.push_back(params[0]);
-		modelist.insert(modelist.end(), params.begin()+2, params.end());
+	if (TS > ourTS)
+		return CMD_FAILURE;
 
-		bool merge = (TS == ourTS) && IS_SERVER(who);
-		ServerInstance->Modes->Process(modelist, who, merge);
-		return CMD_SUCCESS;
-	}
-	/* If the TS is greater than ours, we drop the mode and dont pass it anywhere.
+	/* TS is equal or less: Merge the mode changes into ours and pass on.
 	 */
-	return CMD_FAILURE;
-}
+	std::vector<std::string> modelist;
+	modelist.reserve(params.size()-1);
+	/* Insert everything into modelist except the TS (params[1]) */
+	modelist.push_back(params[0]);
+	modelist.insert(modelist.end(), params.begin()+2, params.end());
 
+	ModeParser::ModeProcessFlag flags = ModeParser::MODE_LOCALONLY;
+	if ((TS == ourTS) && IS_SERVER(who))
+		flags |= ModeParser::MODE_MERGE;
 
+	ServerInstance->Modes->Process(modelist, who, flags);
+	return CMD_SUCCESS;
+}