Module: ngircd.git Branch: master Commit: 313881d0c1466e6b8f52b4456b66a2477ccba9cf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=313881d0c... Author: Alexander Barton <alex@barton.de> Date: Tue Jul 30 22:08:04 2013 +0200 Add penalty times in error paths of generic IRC helper macros Add a 2 second penalty time when the number of parameters is invalid. --- src/ngircd/irc-macros.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h index f0c0f36..abb93f0 100644 --- a/src/ngircd/irc-macros.h +++ b/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.