ROUTE_TYPE_LOCALONLY,
ROUTE_TYPE_BROADCAST,
ROUTE_TYPE_UNICAST,
+ ROUTE_TYPE_MESSAGE,
ROUTE_TYPE_OPT_BCAST,
ROUTE_TYPE_OPT_UCAST
};
{
/** 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
*/
#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 */
*/
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
*/
/** 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
* 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)
+ 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;
- }
-
- 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)
- {
- use_count = 0;
- total_bytes = 0;
}
/** Handle the command from a user.
return works_before_reg;
}
- /** Standard constructor gubbins
- */
virtual ~Command()
{
- syntax.clear();
}
};