Fix timeoutlist calling ConnectServer when not needed

[user/henk/code/inspircd.git] / include / ctables.h

diff --git a/include/ctables.h b/include/ctables.h
index 95db50b1a14317f41cacf10fe1a647a8d8a7d5ff..dd83a05a3ca118cd4337e2143cd9ac05b54b2531 100644 (file)
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -21,7 +21,6 @@ enum CmdResult
        CMD_FAILURE = 0,        /* Command exists, but failed */
        CMD_SUCCESS = 1,        /* Command exists, and succeeded */
        CMD_INVALID = 2         /* Command doesnt exist at all! */
-#define CMD_LOCALONLY CMD_FAILURE
 };
 
 /** Translation types for translation of parameters to UIDs.
@@ -47,6 +46,7 @@ enum RouteType
        ROUTE_TYPE_LOCALONLY,
        ROUTE_TYPE_BROADCAST,
        ROUTE_TYPE_UNICAST,
+       ROUTE_TYPE_MESSAGE,
        ROUTE_TYPE_OPT_BCAST,
        ROUTE_TYPE_OPT_UCAST
 };
@@ -75,6 +75,8 @@ struct RouteDescriptor
 #define ROUTE_BROADCAST (RouteDescriptor(ROUTE_TYPE_BROADCAST, ""))
 /** Route this command to a single server (do nothing if own server name specified) */
 #define ROUTE_UNICAST(x) (RouteDescriptor(ROUTE_TYPE_UNICAST, x))
+/** Route this command as a message with the given target (any of user, #channel, @#channel, $servermask) */
+#define ROUTE_MESSAGE(x) (RouteDescriptor(ROUTE_TYPE_MESSAGE, x))
 /** Route this command to all servers wrapped via ENCAP, so ignored if not understood */
 #define ROUTE_OPT_BCAST (RouteDescriptor(ROUTE_TYPE_OPT_BCAST, ""))
 /** Route this command to a single server wrapped via ENCAP, so ignored if not understood */
@@ -85,17 +87,13 @@ struct RouteDescriptor
  */
 class CoreExport Command : public Extensible
 {
- protected:
-       /** Owner/Creator object
-        */
-       InspIRCd* ServerInstance;
  public:
        /** Command name
        */
        std::string command;
 
-       /** Creator module, NULL for core commands */
-       Module* creator;
+       /** Creator module - never NULL */
+       Module* const creator;
 
        /** User flags needed to execute the command or 0
         */
@@ -139,7 +137,7 @@ class CoreExport Command : public Extensible
 
        /** How many seconds worth of penalty does this command have?
         */
-       const int Penalty;
+       int Penalty;
 
        /** Create a new command.
         * @param Instance Pointer to creator class
@@ -152,59 +150,22 @@ class CoreExport Command : public Extensible
         * be allowed before the user is 'registered' (has sent USER,
         * NICK, optionally PASS, and been resolved).
         */
-       Command(InspIRCd* Instance, Module* me, const std::string &cmd, const char *flags, int minpara, bool before_reg = false, int penalty = 1) :
-               ServerInstance(Instance), command(cmd), creator(me), flags_needed(flags ? *flags : 0),
-               min_params(minpara), max_params(0), disabled(false), works_before_reg(before_reg), Penalty(penalty)
-       {
-               use_count = 0;
-               total_bytes = 0;
-       }
-
-       Command(InspIRCd* Instance, Module* me, const std::string &cmd, const char *flags, int minpara, int maxpara, bool before_reg = false, int penalty = 1) :
-               ServerInstance(Instance), command(cmd), creator(me), flags_needed(flags ? *flags : 0),
-               min_params(minpara), max_params(maxpara), disabled(false), works_before_reg(before_reg), Penalty(penalty)
+       Command(Module* me, const std::string &cmd, int minpara = 0, int maxpara = 0) :
+               command(cmd), creator(me), flags_needed(0), min_params(minpara), max_params(maxpara),
+               use_count(0), total_bytes(0), disabled(false), works_before_reg(false), Penalty(1)
        {
-               use_count = 0;
-               total_bytes = 0;
        }
 
        /** Handle the command from a user.
         * @param parameters The parameters for the command.
         * @param user The user who issued the command.
         * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-        * If the command succeeds but should remain local to this server,
-        * return CMD_LOCALONLY.
         */
        virtual CmdResult Handle(const std::vector<std::string>& parameters, User* user) = 0;
 
        virtual RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               return ROUTE_BROADCAST;
-       }
-
-       /** Handle an internal request from another command, the core, or a module
-        * @param Command ID
-        * @param Zero or more parameters, whos form is specified by the command ID.
-        * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-        * If the command succeeds but should remain local to this server,
-        * return CMD_LOCALONLY.
-        */
-       virtual CmdResult HandleInternal(const unsigned int /* id */, const std::deque<classbase*>& /* params */)
-       {
-               return CMD_INVALID;
-       }
-
-       /** Handle the command from a server.
-        * Not currently used in this version of InspIRCd.
-        * @param parameters The parameters given
-        * @param servername The server name which issued the command
-        * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-        * If the command succeeds but should remain local to this server,
-        * return CMD_LOCALONLY.
-        */
-       virtual CmdResult HandleServer(const std::vector<std::string>& /* parameters */, const std::string& /* servername */)
-       {
-               return CMD_INVALID;
+               return ROUTE_LOCALONLY;
        }
 
        /** Encode a parameter for server->server transmission.
@@ -250,11 +211,8 @@ class CoreExport Command : public Extensible
                return works_before_reg;
        }
 
-       /** Standard constructor gubbins
-        */
        virtual ~Command()
        {
-               syntax.clear();
        }
 };