X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmetadata.cpp;h=8ce41d87f1f5012ac12660bf42d091c5ea89ffe3;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=4760793cb80adf05c8e0f5ab66ef396441f406eb;hpb=dce58b1611e275118d418bfb3b4402bd14d279dd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index 4760793cb..8ce41d87f 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -1,49 +1,72 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "commands.h"
 
-#include "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
-
 CmdResult CommandMetadata::Handle(const std::vector<std::string>& params, User *srcuser)
 {
-	std::string value = params.size() < 3 ? "" : params[2];
-	ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]);
 	if (params[0] == "*")
 	{
-		FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(NULL,params[1],value));
+		std::string value = params.size() < 3 ? "" : params[2];
+		FOREACH_MOD(OnDecodeMetaData, (NULL,params[1],value));
+		return CMD_SUCCESS;
 	}
-	else if (*(params[0].c_str()) == '#')
+
+	if (params[0][0] == '#')
 	{
+		// Channel METADATA has an additional parameter: the channel TS
+		// :22D METADATA #channel 12345 extname :extdata
+		if (params.size() < 3)
+			return CMD_INVALID;
+
 		Channel* c = ServerInstance->FindChan(params[0]);
-		if (c)
-		{
-			if (item)
-				item->unserialize(FORMAT_NETWORK, c, value);
-			FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(c,params[1],value));
-		}
+		if (!c)
+			return CMD_FAILURE;
+
+		time_t ChanTS = ConvToInt(params[1]);
+		if (!ChanTS)
+			return CMD_INVALID;
+
+		if (c->age < ChanTS)
+			// Their TS is newer than ours, discard this command and do not propagate
+			return CMD_FAILURE;
+
+		std::string value = params.size() < 4 ? "" : params[3];
+
+		ExtensionItem* item = ServerInstance->Extensions.GetItem(params[2]);
+		if (item)
+			item->unserialize(FORMAT_NETWORK, c, value);
+		FOREACH_MOD(OnDecodeMetaData, (c,params[2],value));
 	}
-	else if (*(params[0].c_str()) != '#')
+	else
 	{
-		User* u = ServerInstance->FindNick(params[0]);
-		if (u)
+		User* u = ServerInstance->FindUUID(params[0]);
+		if ((u) && (!IS_SERVER(u)))
 		{
+			ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]);
+			std::string value = params.size() < 3 ? "" : params[2];
+
 			if (item)
 				item->unserialize(FORMAT_NETWORK, u, value);
-			FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(u,params[1],value));
+			FOREACH_MOD(OnDecodeMetaData, (u,params[1],value));
 		}
 	}