m_spanningtree Replace manual string building of outgoing commands with CmdBuilder...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / servercommand.h

diff --git a/src/modules/m_spanningtree/servercommand.h b/src/modules/m_spanningtree/servercommand.h
index 2fa96423280740f9f903ee7070b6dd704917d0b5..524520a88aa0f2a2157ceec48cb348b7b8b8988b 100644 (file)
--- a/src/modules/m_spanningtree/servercommand.h
+++ b/src/modules/m_spanningtree/servercommand.h
@@ -20,8 +20,16 @@
 #pragma once
 
 #include "utils.h"
+#include "treeserver.h"
 
-class TreeServer;
+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.
  */
@@ -32,6 +40,15 @@ class ServerCommand : public CommandBase
 
        virtual CmdResult Handle(User* user, std::vector<std::string>& parameters) = 0;
        virtual RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+
+       /**
+        * 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.
@@ -45,12 +62,12 @@ class UserOnlyServerCommand : public ServerCommand
                : ServerCommand(Creator, Name, MinPara, MaxPara) { }
 
        CmdResult Handle(User* user, std::vector<std::string>& parameters)
-    {
-       RemoteUser* remoteuser = IS_REMOTE(user);
+       {
+               RemoteUser* remoteuser = IS_REMOTE(user);
                if (!remoteuser)
-                       return CMD_INVALID;
+                       throw ProtocolException("Invalid source");
                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.
@@ -64,12 +81,12 @@ class ServerOnlyServerCommand : public ServerCommand
                : 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);
+                       throw ProtocolException("Invalid source");
+               TreeServer* server = TreeServer::Get(user);
                return static_cast<T*>(this)->HandleServer(server, parameters);
-    }
+       }
 };
 
 class ServerCommandManager