X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fctables.h;h=a69f5c86f65e14c3fc18ae7abdd75b4deee4905c;hb=86092ec5919a5b08391ea7291b9338b3745b6e0a;hp=2ccca0f7bf5b7b0479c89e6a995d9e152d4ecdb0;hpb=11cafc12d5440b67a9f676c9f6aa67840ca5399d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/ctables.h b/include/ctables.h
index 2ccca0f7b..a69f5c86f 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -43,7 +43,6 @@ const char FLAG_SERVERONLY = 7; // technically anything nonzero below 'A' works
  */
 enum TranslateType
 {
-	TR_END,			/* End of known parameters, everything after this is TR_TEXT */
 	TR_TEXT,		/* Raw text, leave as-is */
 	TR_NICK,		/* Nickname, translate to UUID for server->server */
 	TR_CUSTOM		/* Custom translation handled by EncodeParameter/DecodeParameter */
@@ -76,10 +75,17 @@ struct RouteDescriptor
 	 */
 	std::string serverdest;
 
+	/** For unicast, the destination Server
+	 */
+	Server* server;
+
 	/** Create a RouteDescriptor
 	 */
 	RouteDescriptor(RouteType t, const std::string &d)
-		: type(t), serverdest(d) { }
+		: type(t), serverdest(d), server(NULL) { }
+
+	RouteDescriptor(RouteType t, Server* srv)
+		: type(t), server(srv) { }
 };
 
 /** Do not route this command */
@@ -98,7 +104,7 @@ struct RouteDescriptor
 /** A structure that defines a command. Every command available
  * in InspIRCd must be defined as derived from Command.
  */
-class CoreExport Command : public ServiceProvider
+class CoreExport CommandBase : public ServiceProvider
 {
  public:
 	/** User flags needed to execute the command or 0
@@ -119,10 +125,6 @@ class CoreExport Command : public ServiceProvider
 	 */
 	unsigned long use_count;
 
-	/** used by /stats m
-	 */
-	unsigned long total_bytes;
-
 	/** True if the command is disabled to non-opers
 	 */
 	bool disabled;
@@ -161,20 +163,13 @@ class CoreExport Command : public ServiceProvider
 	 * @param maxpara Maximum number of parameters this command may have - extra parameters
 	 * will be tossed into one last space-seperated param.
 	 */
-	Command(Module* me, const std::string &cmd, int minpara = 0, int maxpara = 0) :
+	CommandBase(Module* me, const std::string &cmd, int minpara = 0, int maxpara = 0) :
 		ServiceProvider(me, cmd, SERVICE_COMMAND), flags_needed(0), min_params(minpara), max_params(maxpara),
-		use_count(0), total_bytes(0), disabled(false), works_before_reg(false), allow_empty_last_param(true),
+		use_count(0), disabled(false), works_before_reg(false), allow_empty_last_param(true),
 		Penalty(1)
 	{
 	}
 
-	/** 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.
-	 */
-	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_LOCALONLY;
@@ -223,7 +218,34 @@ class CoreExport Command : public ServiceProvider
 		return works_before_reg;
 	}
 
-	virtual ~Command();
+	virtual ~CommandBase();
+};
+
+class CoreExport Command : public CommandBase
+{
+ public:
+	/** If true, the command will not be forwarded by the linking module even if it comes via ENCAP.
+	 * Can be used to forward commands before their effects.
+	 */
+	bool force_manual_route;
+
+	Command(Module* me, const std::string& cmd, unsigned int minpara = 0, unsigned int maxpara = 0)
+		: CommandBase(me, cmd, minpara, maxpara)
+		, force_manual_route(false)
+	{
+	}
+
+	/** 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.
+	 */
+	virtual CmdResult Handle(const std::vector<std::string>& parameters, User* user) = 0;
+
+	/** Destructor
+	 * Removes this command from the command parser
+	 */
+	~Command();
 };
 
 class CoreExport SplitCommand : public Command