Commit Diff

Commit:
313881d0c1466e6b8f52b4456b66a2477ccba9cf
From:
Alexander Barton <alex@barton.de>
Date:
Message:
Add penalty times in error paths of generic IRC helper macros Add a 2 second penalty time when the number of parameters is invalid.
Actions:
Patch | Tree
commit - 3bd973037a1664387161a465f801b78ff0180fa1
commit + 313881d0c1466e6b8f52b4456b66a2477ccba9cf
blob - f0c0f36ec6e32c8c4aa3195d031e7a9082d04dd6
blob + abb93f012b0811712a4e65bca0ce0aa7692764ce
--- src/ngircd/irc-macros.h
+++ src/ngircd/irc-macros.h
@@ -24,9 +24,11 @@
  * return from the function.
  */
 #define _IRC_ARGC_EQ_OR_RETURN_(Client, Req, Count) \
-if (Req->argc != Count) \
+if (Req->argc != Count) { \
+	IRC_SetPenalty(Client, 2); \
 	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-				  Client_ID(Client), Req->command);
+				  Client_ID(Client), Req->command); \
+}
 
 /**
  * Make sure that number of passed parameters is less or equal than Max.
@@ -35,9 +37,11 @@ if (Req->argc != Count) \
  * return from the function.
  */
 #define _IRC_ARGC_LE_OR_RETURN_(Client, Req, Max) \
-if (Req->argc > Max) \
+if (Req->argc > Max) { \
+	IRC_SetPenalty(Client, 2); \
 	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-				  Client_ID(Client), Req->command);
+				  Client_ID(Client), Req->command); \
+}
 
 /**
  * Make sure that number of passed parameters is greater or equal than Min.
@@ -46,9 +50,11 @@ if (Req->argc > Max) \
  * return from the function.
  */
 #define _IRC_ARGC_GE_OR_RETURN_(Client, Req, Min) \
-if (Req->argc < Min) \
+if (Req->argc < Min) { \
+	IRC_SetPenalty(Client, 2); \
 	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-				  Client_ID(Client), Req->command);
+				  Client_ID(Client), Req->command); \
+}
 
 /**
  * Make sure that number of passed parameters is in between Min and Max.
@@ -57,9 +63,11 @@ if (Req->argc < Min) \
  * parameters, send an error to the client and return from the function.
  */
 #define _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, Min, Max) \
-if (Req->argc < Min || Req->argc > Max) \
+if (Req->argc < Min || Req->argc > Max) { \
+	IRC_SetPenalty(Client, 2); \
 	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-				  Client_ID(Client), Req->command);
+				  Client_ID(Client), Req->command); \
+}
 
 /**
  * Get sender of an IRC command.