m_spanningtree Allow server-to-server command handlers to specify whether they accept servers, remote users or both as the command source

To make life easier for handlers accepting servers only as source, pass them a TreeServer* so they don't have to call FindServer()

1 files changed, 44 insertions, 0 deletions

diff --git a/src/modules/m_spanningtree/servercommand.h b/src/modules/m_spanningtree/servercommand.h
index 4311dd7b7..2fa964232 100644
--- a/src/modules/m_spanningtree/servercommand.h
+++ b/src/modules/m_spanningtree/servercommand.h
@@ -19,6 +19,12 @@
 
 #pragma once
 
+#include "utils.h"
+
+class TreeServer;
+
+/** Base class for server-to-server commands that may have a (remote) user source or server source.
+ */
 class ServerCommand : public CommandBase
 {
  public:
@@ -28,6 +34,44 @@ class ServerCommand : public CommandBase
 	virtual RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
 };
 
+/** Base class for server-to-server command handlers which are only valid if their source is a user.
+ * When a server sends a command of this type and the source is a server (sid), the link is aborted.
+ */
+template <class T>
+class UserOnlyServerCommand : public ServerCommand
+{
+ public:
+	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)
+    {
+    	RemoteUser* remoteuser = IS_REMOTE(user);
+		if (!remoteuser)
+			return CMD_INVALID;
+		return static_cast<T*>(this)->HandleRemote(remoteuser, parameters);
+    }
+};
+
+/** Base class for server-to-server command handlers which are only valid if their source is a server.
+ * When a server sends a command of this type and the source is a user (uuid), the link is aborted.
+ */
+template <class T>
+class ServerOnlyServerCommand : public ServerCommand
+{
+ public:
+	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)
+    {
+		if (!IS_SERVER(user))
+			return CMD_INVALID;
+		TreeServer* server = Utils->FindServer(user->server);
+		return static_cast<T*>(this)->HandleServer(server, parameters);
+    }
+};
+
 class ServerCommandManager
 {
 	typedef TR1NS::unordered_map<std::string, ServerCommand*> ServerCommandMap;