New cmode.flood_type_action which can be used to indicate a channel…

… mode

can be used from +f/+F as an action. You need to specify for which
flood type your mode is, eg `cmode.flood_type_action = 'j';` for joinflood.

Currently a mode can only choose one flood type action due to +f/+F
timer fights that could otherwise occur, but that shouldn't be too
much of an issue since we can live with that in core as well.

doc/RELEASE-NOTES.md

@@ -80,6 +80,9 @@ in progress and not a stable version.
   `int soft` and for return value you will normally `return 0` here.
   You can `return 1` if you resist freeing, which is rare and only used by
   `+F` with set::anti-flood::channel::default-profile.
+* New `cmode.flood_type_action` which can be used to indicate a channel mode
+  can be used from +f/+F as an action. You need to specify for which
+  flood type your mode is, eg `cmode.flood_type_action = 'j';` for joinflood.
 * JSON-RPC supports
   [UNIX domain sockets](https://www.unrealircd.org/docs/JSON-RPC:Technical_documentation#UNIX_domain_socket)
   for making RPC calls. If those are used, we now split on `\n` (newline)

include/modules.h

@@ -321,14 +321,19 @@ struct Cmode {
 	/** Unsetting also eats/requires a parameter. Unusual, but possible. */
 	char unset_with_param;
 
+	/** Is this mode available for chanmode +f, and if so for which flood type?
+	 * eg 'j' for join flood.
+	 */
+	char flood_type_action;
+
 	/** Is this mode being unloaded?
 	 * This is set to 1 if the chanmode module providing this mode is unloaded
 	 * and we are waiting to see if in our new round of loads a "new" chanmode
 	 * module will popup to take this mode. This only happens during a rehash,
 	 * should never be 0 outside an internal rehash.
 	 */
 	char unloaded;
-	
+
 	/** Slot number - Can be used instead of GETPARAMSLOT() */
 	int param_slot;
 
@@ -355,6 +360,7 @@ typedef struct {
 	int		(*sjoin_check)(Channel *, void *, void *);
 	char		local;
 	char		unset_with_param;
+	char		flood_type_action;
 } CmodeInfo;
 
 /** Get a slot number for a param - eg GETPARAMSLOT('k') */

src/api-channelmode.c

@@ -423,6 +423,7 @@ Cmode *CmodeAdd(Module *module, CmodeInfo req, Cmode_t *mode)
 	cm->sjoin_check = req.sjoin_check;
 	cm->local = req.local;
 	cm->unset_with_param = req.unset_with_param;
+	cm->flood_type_action = req.flood_type_action;
 	cm->owner = module;
 	cm->unloaded = 0;
 

src/modules/chanmodes/floodprot.c

@@ -98,8 +98,10 @@ struct MemberFlood {
 
 /* Maximum timers, iotw: max number of possible actions.
  * Currently this is: CNmMKiRd (8)
+ * But bumped to 15 because we now have cmode.flood_type_action
+ * so there could be more ;).
  */
-#define MAXCHMODEFACTIONS 8
+#define MAXCHMODEFACTIONS 15
 
 /** Per-channel flood protection settings and counters */
 struct ChannelFloodProtection {
@@ -653,6 +655,21 @@ int parse_channel_mode_flood_failed(const char **error_out, ChannelFloodProtecti
 	return 0;
 }
 
+int floodprot_valid_alternate_action(char action, FloodType *floodtype)
+{
+	Cmode *cm;
+
+	/* Built-in actions */
+	if (strchr(floodtype->actions, action))
+		return 1;
+
+	cm = find_channel_mode_handler(action);
+	if (cm && cm->flood_type_action == floodtype->letter)
+		return 1;
+
+	return 0;
+}
+
 /** Parse channel mode +f string.
  * @param param		The parameter string to parse
  * @param fld		The setting struct to fill, this MAY already contain data.
@@ -759,7 +776,7 @@ int parse_channel_mode_flood(const char *param, ChannelFloodProtection *fld, int
 
 		index = floodtype->index;
 		fld->limit[index] = v;
-		if (a && strchr(floodtype->actions, a))
+		if (a && floodprot_valid_alternate_action(a, floodtype))
 			fld->action[index] = a;
 		else
 			fld->action[index] = floodtype->default_action;