Remove the -Dssize_t declaration now its typedeffed.

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

diff --git a/include/ctables.h b/include/ctables.h
index b57a29b4dd6ad5529d33652b0ee7236e26762067..c0c094e6f5562dc33c4450fd929fa7480123a2b1 100644 (file)
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -46,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
 };
@@ -57,10 +58,10 @@ struct RouteDescriptor
 {
        /** Routing type from the enum above
         */
-       const RouteType type;
+       RouteType type;
        /** For unicast, the destination server's name
         */
-       const std::string serverdest;
+       std::string serverdest;
 
        /** Create a RouteDescriptor
         */
@@ -74,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 */
@@ -84,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
         */
@@ -138,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
@@ -151,20 +150,10 @@ 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.
@@ -179,27 +168,6 @@ class CoreExport Command : public Extensible
                return ROUTE_LOCALONLY;
        }
 
-       /** 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.
-        */
-       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.
-        */
-       virtual CmdResult HandleServer(const std::vector<std::string>& /* parameters */, const std::string& /* servername */)
-       {
-               return CMD_INVALID;
-       }
-
        /** Encode a parameter for server->server transmission.
         * Used for parameters for which the translation type is TR_CUSTOM.
         * @param parameter The parameter to encode. Can be modified in place.
@@ -243,11 +211,8 @@ class CoreExport Command : public Extensible
                return works_before_reg;
        }
 
-       /** Standard constructor gubbins
-        */
        virtual ~Command()
        {
-               syntax.clear();
        }
 };