From: Federico G. Schwindt Date: Thu, 7 Nov 2013 16:29:21 +0000 (+0000) Subject: Move IRC_SetPenalty() to Handle_Request() when possible X-Git-Tag: rel-22-rc1~98 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=fcf61e9e0264d081e72eedddbd4a45b619e82b01 Move IRC_SetPenalty() to Handle_Request() when possible This centralizes the penalty handling. It also exposes some commands that lack it for our attention. --- diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 0421d917..cab20c49 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -480,8 +480,6 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - IRC_SetPenalty(Client, 1); - _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) chan = Channel_Search(Req->argv[0]); @@ -578,8 +576,6 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) assert(Client != NULL); assert(Req != NULL); - IRC_SetPenalty(Client, 2); - _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) if (Req->argc > 0) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 79a157c2..202f427f 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -500,8 +500,6 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - IRC_SetPenalty(Client, 1); - _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix) @@ -544,8 +542,6 @@ IRC_INFO(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - IRC_SetPenalty(Client, 2); - _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix) @@ -631,8 +627,6 @@ IRC_LINKS(CLIENT *Client, REQUEST *Req) assert(Client != NULL); assert(Req != NULL); - IRC_SetPenalty(Client, 1); - _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) /* Get pointer to server mask or "*", if none given */ @@ -685,8 +679,6 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - IRC_SetPenalty(Client, 1); - _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from) @@ -716,8 +708,6 @@ IRC_SERVLIST(CLIENT *Client, REQUEST *Req) assert(Client != NULL); assert(Req != NULL); - IRC_SetPenalty(Client, 1); - if (Req->argc < 2 || strcmp(Req->argv[1], "0") == 0) { for (c = Client_First(); c!= NULL; c = Client_Next(c)) { if (Client_Type(c) != CLIENT_SERVICE) @@ -753,8 +743,6 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - IRC_SetPenalty(Client, 3); - _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from) @@ -785,8 +773,6 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - IRC_SetPenalty(Client, 1); - _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from) @@ -871,8 +857,6 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) assert(Client != NULL); assert(Req != NULL); - IRC_SetPenalty(Client, 2); - _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from) @@ -1013,8 +997,6 @@ IRC_TIME( CLIENT *Client, REQUEST *Req ) assert(Client != NULL); assert(Req != NULL); - IRC_SetPenalty(Client, 1); - _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from) @@ -1048,8 +1030,6 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req) assert(Client != NULL); assert(Req != NULL); - IRC_SetPenalty(Client, 1); - if (Req->argc > 5) max = 5; else @@ -1110,8 +1090,6 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - IRC_SetPenalty(Client, 1); - _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix) @@ -1145,15 +1123,12 @@ IRC_WHO(CLIENT *Client, REQUEST *Req) assert (Client != NULL); assert (Req != NULL); - IRC_SetPenalty(Client, 1); - only_ops = false; if (Req->argc == 2) { if (strcmp(Req->argv[1], "o") == 0) only_ops = true; #ifdef STRICT_RFC else { - IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 35f1a59a..d6a751a0 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -224,8 +224,6 @@ IRC_TRACE(CLIENT *Client, REQUEST *Req) assert(Client != NULL); assert(Req != NULL); - IRC_SetPenalty(Client, 3); - _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from) @@ -301,8 +299,6 @@ IRC_HELP(CLIENT *Client, REQUEST *Req) assert(Client != NULL); assert(Req != NULL); - IRC_SetPenalty(Client, 2); - if ((Req->argc == 0 && array_bytes(&Conf_Helptext) > 0) || (Req->argc >= 1 && strcasecmp(Req->argv[0], "Commands") != 0)) { /* Help text available and requested */ diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index ae6f4d20..4235497b 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -60,80 +60,80 @@ struct _NUMERIC { static COMMAND My_Commands[] = { -#define _CMD(name, func, type, min, max) \ - { (name), (func), (type), (min), (max), 0, 0, 0 } - _CMD("ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 1), - _CMD("AWAY", IRC_AWAY, CLIENT_USER, 0, 1), - _CMD("CAP", IRC_CAP, CLIENT_ANY, 1, 2), - _CMD("CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, -1), +#define _CMD(name, func, type, min, max, penalty) \ + { (name), (func), (type), (min), (max), (penalty), 0, 0, 0 } + _CMD("ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 1, 1), + _CMD("AWAY", IRC_AWAY, CLIENT_USER, 0, 1, 0), + _CMD("CAP", IRC_CAP, CLIENT_ANY, 1, 2, 0), + _CMD("CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), #ifdef STRICT_RFC - _CMD("DIE", IRC_DIE, CLIENT_USER, 0, 0), + _CMD("DIE", IRC_DIE, CLIENT_USER, 0, 0, 0), #else - _CMD("DIE", IRC_DIE, CLIENT_USER, 0, 1), + _CMD("DIE", IRC_DIE, CLIENT_USER, 0, 1, 0), #endif - _CMD("DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 1, 1), - _CMD("ERROR", IRC_ERROR, CLIENT_ANY, 0, -1), - _CMD("GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1), - _CMD("HELP", IRC_HELP, CLIENT_USER, 0, 1), - _CMD("INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 1), - _CMD("INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2), - _CMD("ISON", IRC_ISON, CLIENT_USER, 1, -1), - _CMD("JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 1, 2), - _CMD("KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 2, 3), - _CMD("KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 2, 2), - _CMD("KLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1), - _CMD("LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 2), - _CMD("LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 2), - _CMD("LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 2), - _CMD("METADATA", IRC_METADATA, CLIENT_SERVER, 3, 3), - _CMD("MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1), - _CMD("MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 1), - _CMD("NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 2), - _CMD("NICK", IRC_NICK, CLIENT_ANY, 0, -1), - _CMD("NJOIN", IRC_NJOIN, CLIENT_SERVER, 2, 2), - _CMD("NOTICE", IRC_NOTICE, CLIENT_ANY, 0, -1), - _CMD("OPER", IRC_OPER, CLIENT_USER, 2, 2), - _CMD("PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 1, 2), - _CMD("PASS", IRC_PASS, CLIENT_ANY, 0, -1), - _CMD("PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, -1), - _CMD("PONG", IRC_PONG, CLIENT_ANY, 0, -1), - _CMD("PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 2), - _CMD("QUIT", IRC_QUIT, CLIENT_ANY, 0, 1), - _CMD("REHASH", IRC_REHASH, CLIENT_USER, 0, 0), - _CMD("RESTART", IRC_RESTART, CLIENT_USER, 0, 0), - _CMD("SERVER", IRC_SERVER, CLIENT_ANY, 0, -1), - _CMD("SERVICE", IRC_SERVICE, CLIENT_ANY, 6, 6), - _CMD("SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 2), - _CMD("SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 2), - _CMD("SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 2, 2), - _CMD("STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 2), - _CMD("SVSNICK", IRC_SVSNICK, CLIENT_SERVER, 2, 2), - _CMD("SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, -1), - _CMD("TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 1), - _CMD("TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 1, 2), - _CMD("TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 1), - _CMD("USER", IRC_USER, CLIENT_ANY, 0, -1), - _CMD("USERHOST", IRC_USERHOST, CLIENT_USER, 1, -1), - _CMD("USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, -1), - _CMD("VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 1), - _CMD("WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 1, 1), - _CMD("WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 4, 4), - _CMD("WHO", IRC_WHO, CLIENT_USER, 0, 2), - _CMD("WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1), - _CMD("WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, -1), + _CMD("DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 1, 1, 0), + _CMD("ERROR", IRC_ERROR, CLIENT_ANY, 0, -1, 0), + _CMD("GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), + _CMD("HELP", IRC_HELP, CLIENT_USER, 0, 1, 2), + _CMD("INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 1, 2), + _CMD("INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2, 0), + _CMD("ISON", IRC_ISON, CLIENT_USER, 1, -1, 0), + _CMD("JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 1, 2, 0), + _CMD("KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 2, 3, 0), + _CMD("KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 2, 2, 0), + _CMD("KLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), + _CMD("LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 2, 1), + _CMD("LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 2, 2), + _CMD("LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 2, 1), + _CMD("METADATA", IRC_METADATA, CLIENT_SERVER, 3, 3, 0), + _CMD("MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1, 0), + _CMD("MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 1, 3), + _CMD("NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 2, 1), + _CMD("NICK", IRC_NICK, CLIENT_ANY, 0, -1, 0), + _CMD("NJOIN", IRC_NJOIN, CLIENT_SERVER, 2, 2, 0), + _CMD("NOTICE", IRC_NOTICE, CLIENT_ANY, 0, -1, 0), + _CMD("OPER", IRC_OPER, CLIENT_USER, 2, 2, 0), + _CMD("PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 1, 2, 0), + _CMD("PASS", IRC_PASS, CLIENT_ANY, 0, -1, 0), + _CMD("PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), + _CMD("PONG", IRC_PONG, CLIENT_ANY, 0, -1, 0), + _CMD("PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 2, 0), + _CMD("QUIT", IRC_QUIT, CLIENT_ANY, 0, 1, 0), + _CMD("REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0), + _CMD("RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0), + _CMD("SERVER", IRC_SERVER, CLIENT_ANY, 0, -1, 0), + _CMD("SERVICE", IRC_SERVICE, CLIENT_ANY, 6, 6, 0), + _CMD("SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 2, 1), + _CMD("SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 2, 0), + _CMD("SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 2, 2, 0), + _CMD("STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 2, 2), + _CMD("SVSNICK", IRC_SVSNICK, CLIENT_SERVER, 2, 2, 0), + _CMD("SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), + _CMD("TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 1, 1), + _CMD("TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 1, 2, 1), + _CMD("TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 1, 3), + _CMD("USER", IRC_USER, CLIENT_ANY, 0, -1, 0), + _CMD("USERHOST", IRC_USERHOST, CLIENT_USER, 1, -1, 1), + _CMD("USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), + _CMD("VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 1, 1), + _CMD("WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 1, 1, 0), + _CMD("WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 4, 4, 0), + _CMD("WHO", IRC_WHO, CLIENT_USER, 0, 2, 1), + _CMD("WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), + _CMD("WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0), #ifdef IRCPLUS - _CMD("CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, -1), + _CMD("CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, -1, 0), # ifdef ICONV - _CMD("CHARCONV", IRC_CHARCONV, CLIENT_USER, 1, 1), + _CMD("CHARCONV", IRC_CHARCONV, CLIENT_USER, 1, 1, 0), # endif #endif #ifndef STRICT_RFC - _CMD("GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1), - _CMD("POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1), + _CMD("GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1, 0), + _CMD("POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1, 0), #endif - _CMD(NULL, NULL, 0, 0, 0) /* End-Mark */ + _CMD(NULL, NULL, 0, 0, 0, 0) /* End-Mark */ #undef _CMD }; @@ -538,6 +538,9 @@ Handle_Request( CONN_ID Idx, REQUEST *Req ) return IRC_WriteErrClient(client, ERR_NEEDMOREPARAMS_MSG, Client_ID(client), Req->command); + if (cmd->penalty) + IRC_SetPenalty(client, cmd->penalty); + /* Command is allowed for this client: call it and count * generated bytes in output */ Conn_ResetWCounter(); diff --git a/src/ngircd/parse.h b/src/ngircd/parse.h index beac2275..859c7ce5 100644 --- a/src/ngircd/parse.h +++ b/src/ngircd/parse.h @@ -37,6 +37,7 @@ typedef struct _COMMAND CLIENT_TYPE type; /**< Valid client types (bit mask) */ int min_argc; /**< Min parameters */ int max_argc; /**< Max parameters */ + int penalty; /**< Penalty for this command */ long lcount, rcount; /**< Number of local and remote calls */ long bytes; /**< Number of bytes created */ } COMMAND;