X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fservercommand.h;h=5248983612c753739e02029a51cd367eb7948622;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=156b405e4f74f82b3aa3be10cdc16d3ed85a14ac;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/servercommand.h b/src/modules/m_spanningtree/servercommand.h
index 156b405e4..524898361 100644
--- a/src/modules/m_spanningtree/servercommand.h
+++ b/src/modules/m_spanningtree/servercommand.h
@@ -1,7 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
  *
  * 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
@@ -22,6 +23,15 @@
 #include "utils.h"
 #include "treeserver.h"
 
+class ProtocolException : public ModuleException
+{
+ public:
+	ProtocolException(const std::string& msg)
+		: ModuleException("Protocol violation: " + msg)
+	{
+	}
+};
+
 /** Base class for server-to-server commands that may have a (remote) user source or server source.
  */
 class ServerCommand : public CommandBase
@@ -29,8 +39,21 @@ class ServerCommand : public CommandBase
  public:
 	ServerCommand(Module* Creator, const std::string& Name, unsigned int MinPara = 0, unsigned int MaxPara = 0);
 
-	virtual CmdResult Handle(User* user, std::vector<std::string>& parameters) = 0;
-	virtual RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+	/** Register this object in the ServerCommandManager
+	 */
+	void RegisterService() CXX11_OVERRIDE;
+
+	virtual CmdResult Handle(User* user, Params& parameters) = 0;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+
+	/**
+	 * Extract the TS from a string.
+	 * @param tsstr The string containing the TS.
+	 * @return The raw timestamp value.
+	 * This function throws a ProtocolException if it considers the TS invalid. Note that the detection of
+	 * invalid timestamps is not designed to be bulletproof, only some cases - like "0" - trigger an exception.
+	 */
+	static time_t ExtractTS(const std::string& tsstr);
 };
 
 /** Base class for server-to-server command handlers which are only valid if their source is a user.
@@ -43,11 +66,11 @@ class UserOnlyServerCommand : public ServerCommand
 	UserOnlyServerCommand(Module* Creator, const std::string& Name, unsigned int MinPara = 0, unsigned int MaxPara = 0)
 		: ServerCommand(Creator, Name, MinPara, MaxPara) { }
 
-	CmdResult Handle(User* user, std::vector<std::string>& parameters)
+	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE
 	{
 		RemoteUser* remoteuser = IS_REMOTE(user);
 		if (!remoteuser)
-			return CMD_INVALID;
+			throw ProtocolException("Invalid source");
 		return static_cast<T*>(this)->HandleRemote(remoteuser, parameters);
 	}
 };
@@ -62,10 +85,10 @@ class ServerOnlyServerCommand : public ServerCommand
 	ServerOnlyServerCommand(Module* Creator, const std::string& Name, unsigned int MinPara = 0, unsigned int MaxPara = 0)
 		: ServerCommand(Creator, Name, MinPara, MaxPara) { }
 
-	CmdResult Handle(User* user, std::vector<std::string>& parameters)
+	CmdResult Handle(User* user, CommandBase::Params& parameters) CXX11_OVERRIDE
 	{
 		if (!IS_SERVER(user))
-			return CMD_INVALID;
+			throw ProtocolException("Invalid source");
 		TreeServer* server = TreeServer::Get(user);
 		return static_cast<T*>(this)->HandleServer(server, parameters);
 	}