- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Commands.txt: Update more descriptions
by alex＠arthur.barton.de 02 Aug '13

02 Aug '13

Module: ngircd.git Branch: master Commit: adc8d4f6c89a11e08f5214e4ceb1323376a42ec5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=adc8d4f6… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 2 23:25:23 2013 +0200 Commands.txt: Update more descriptions Update description of "CONNECT", "DIE", "DISCONNECT", "GLINE", "KILL", "KLINE", "OPER", "REHASH", "RESTART" and "WALLOPS". --- doc/Commands.txt | 110 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 86 insertions(+), 24 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 49a84f6..6bbd206 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -651,37 +651,61 @@ Administrative Commands ~~~~~~~~~~~~~~~~~~~~~~~ - CONNECT - CONNECT <target server> [<port> [<remote server> [<mypwd> <peerpwd>]]] + CONNECT <server> [<port> [<remote-server> [<my-pwd> <peer-pwd>]]] . - Instructs the current server, or <remote server> if specified, - to connect to <target server>. + Instructs the current server, or <remote-server> if specified, + to connect to the server named <server>, which must be configured + in the server configuration file. . - To connect <remote server> you need to have remote oper status. - If <port> is omitted, it uses the server port of the configuration. - If <mypwd> and <peerpwd> is given, it uses those passwords instead - of the ones in the configuration. + To use this command, the user must be an IRC Operator. To establish + a connection on a <remote-server>, you must have remote IRC operator + privileges. + . + If <port>, <my-pwd> and <peer-pwd> are given, these values override + the ones specified in the server configuration file. + + References: + - RFC 2812, 3.4.7 "Connect message" - DIE DIE . Instructs the server to shut down. + . + To use this command, the user must be an IRC Operator. + + References: + - RFC 2812, 4.3 "Die message" - DISCONNECT - DISCONNECT [<remote server>] + DISCONNECT <server> + . + Disconnect and disable a locally linked server. . - Disconnects the current server, or <remote server> if specified. - To disconnect a <remote server> you need to have remote oper status. + To use this command, the user must be an IRC Operator. + + References: + - This command is not specified in the IRC RFCs, it is an extension + of ngIRCd. - GLINE - GLINE <nick!user@hostmask> <seconds> :<reason> + GLINE <nick!user@hostmask> [<timeout> :<reason>] + . + This command provides timed G-Lines (network-wide bans). . - This command provides timed G-Lines (Network-wide bans). If a client matches a G-Line, it cannot connect to any server on - the IRC network. If you put 0 as <seconds>, it makes the G-Line - permanent. + the IRC network for <timeout> seconds. When <timoeut> is 0, it make + the G-Line permanent. + . + If no <timeout> and no <reason> is given, the G-Line is removed. . - To remove a G-Line, type "GLINE <nick!user@hostmask>". - To list the G-Lines, type "STATS g". + To use this command, the user must be an IRC Operator. + . + "STATS g" can be used to list all currently active G-Lines. + + References: + - This command is not specified in the IRC RFCs, it is an extension + of ngIRCd. - KILL KILL <nickname> <reason> @@ -691,40 +715,78 @@ Administrative Commands . This command is used internally between servers, too, for example to disconnect duplicate <nickname>'s after a "net split". + . + To use this command, the user must be an IRC Operator. References: - RFC 2812, 3.7.1 "Kill message" - KLINE - KLINE <nick!user@hostmask> <seconds> :<reason> + KLINE <nick!user@hostmask> [<timeout> :<reason>] + . + This command provides timed K-Lines (server-local bans). + . + If a client matches a K-Line, it cannot connect to this server for + <timeout> seconds. When <timoeut> is 0, it makes the K-Line permanent. . - This command provides timed K-Lines (Server-local bans). - If a client matches a K-Line, it cannot connect to the issued server. - If you put 0 as <seconds>, it makes the K-Line permanent. + If no <timeout> and no <reason> is given, the K-Line is removed. . - To remove a K-Line, type "KLINE <nick!user@hostmask>". - To list the K-Lines, type "STATS k". + To use this command, the user must be an IRC Operator. + . + "STATS k" can be used to list all currently active K-Lines. + + References: + - This command is not specified in the IRC RFCs, it is an extension + of ngIRCd. - OPER - OPER <user> <password> + OPER <name> <password> + . + Authenticates a user named <name> as an IRC operator on the current + server/network. + . + This operator <name> must be configured in the server configuration. . - Authenticates <user> as an IRC operator on the current server/network. + Please note that <name> is NOT related to a nickname at all! + + References: + - RFC 2812, 3.1.4 "Oper message" - REHASH REHASH . Causes the server to re-read and re-process its configuration file(s). + . + While rehashing, no new connections are accepted, but all already + established connections stay connected. + . + To use this command, the user must be an IRC Operator. + + References: + - RFC 2812, 4.2 "Rehash message" - RESTART RESTART . Restart the server. + . + While restarting, all connections are reset and no new connections + are accepted. + . + To use this command, the user must be an IRC Operator. + + References: + - RFC 2812, 4.4 "Restart message" - WALLOPS WALLOPS <message> . Sends <message> to all users with user mode "+w". + . + To use this command, the user must be an IRC Operator. + References: + - RFC 2812, 4.7 "Operwall message" IRC Service Commands ~~~~~~~~~~~~~~~~~~~~

1 0

Alexander Barton : Update irc-oper.c to use irc-macros.h
by alex＠arthur.barton.de 02 Aug '13

02 Aug '13

Module: ngircd.git Branch: master Commit: 78c8212280127b421d4a8bb1094560441ffb7eef URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=78c82122… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 2 23:27:11 2013 +0200 Update irc-oper.c to use irc-macros.h --- src/ngircd/irc-oper.c | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 29953a1..80b9f9a 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2013 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ #include "conf.h" #include "channel.h" #include "class.h" +#include "irc-macros.h" #include "irc-write.h" #include "log.h" #include "match.h" @@ -55,8 +56,6 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) /** * Handler for the IRC "OPER" command. * - * See RFC 2812, 3.1.4 "Oper message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -70,9 +69,7 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (Req->argc != 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) len = array_length(&Conf_Opers, sizeof(*op)); op = array_start(&Conf_Opers); @@ -108,8 +105,6 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) /** * Handler for the IRC "DIE" command. * - * See RFC 2812, 4.3 "Die message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -128,14 +123,11 @@ IRC_DIE(CLIENT * Client, REQUEST * Req) if (!Op_Check(Client, Req)) return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ #ifdef STRICT_RFC - if (Req->argc != 0) + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0) #else - if (Req->argc > 1) + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1) #endif - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); /* Is a message given? */ if (Req->argc > 0) { @@ -159,8 +151,6 @@ IRC_DIE(CLIENT * Client, REQUEST * Req) /** * Handler for the IRC "REHASH" command. * - * See RFC 2812, 4.2 "Rehash message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -176,10 +166,7 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) if (!Op_Check(Client, Req)) return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ - if (Req->argc != 0) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command ); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0) Log(LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask(Client)); @@ -193,8 +180,6 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) /** * Handler for the IRC "RESTART" command. * - * See RFC 2812, 4.4 "Restart message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -225,8 +210,6 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req ) /** * Handler for the IRC "CONNECT" command. * - * See RFC 2812, 3.4.7 "Connect message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -377,8 +360,6 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) /** * Handler for the IRC "WALLOPS" command. * - * See RFC 2812, 4.7 "Operwall message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -391,9 +372,7 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (Req->argc != 1) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 1) switch (Client_Type(Client)) { case CLIENT_USER:

1 0

Alexander Barton : Commands.txt: Fix <target> description of TRACE command
by alex＠arthur.barton.de 02 Aug '13

02 Aug '13

Module: ngircd.git Branch: master Commit: 24183b1a918d7475f9fac28a10c6ae49c93e24b3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=24183b1a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 2 02:16:21 2013 +0200 Commands.txt: Fix <target> description of TRACE command --- doc/Commands.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 72e2eda..49a84f6 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -479,12 +479,16 @@ Status and Informational Commands - RFC 2812, 3.4.6 "Time message" - TRACE - TRACE [<server>] + TRACE [<target>] . Find the route to a specific server and send information about its peers. Each server that processes this command reports back to the sender about it: the replies from pass-through servers form a chain which shows the route to the destination. + . + <target> can be a server name, the nickname of a client connected to + a specific server, or a mask matching a server name in the network. + The server of the current connection is used when <target> is omitted. References: - RFC 2812, 3.4.8 "Trace message"

1 0

Alexander Barton : Commands.txt: Update more descriptions
by alex＠arthur.barton.de 02 Aug '13

02 Aug '13

Module: ngircd.git Branch: master Commit: a8ecde255377c4235440c491cb28711a7b59869e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a8ecde25… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 2 01:45:02 2013 +0200 Commands.txt: Update more descriptions Update descriptions of "AWAY", "JOIN", "LIST", "MODE", "PART", "TOPC", and "TRACE". --- doc/Commands.txt | 100 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 79 insertions(+), 21 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 30947c1..72e2eda 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -227,6 +227,9 @@ General Commands . If <message> is omitted, the away status is removed. + References: + - RFC 2812, 4.1 "Away" + - HELP HELP [<command>] . @@ -243,15 +246,46 @@ General Commands ngIRCd replies using "NOTICE" commands like ircd 2.10/2.11; other implementations are using numerics 704, 705, and 706. - - MODE - MODE <nickname> <flags> (user) - MODE <channel> <flags> [<args>] + MODE <nickname> [{+|-}<mode>[<mode>] [{+|-}<mode>[<mode>] [...]]] + MODE <channel> [{+|-}<mode>[<mode>] [<arg> [<arg> [...]]] [{+|-}<mode>[<mode>] [<arg> [<arg> [...]]] [...]]] + . + Set and get user and channel modes. + . + When no mode parameters are given, the currently set user or channel + modes are returned. Otherwise the modes are adjusted accordingly + and the changes will be reported back to the client. + . + All user and chnnel "modes" are indicated by single case-sensitive + characters. . - The MODE command is dual-purpose. It can be used to set both (user) and - <channel> modes. + Please note that a user can only get and set his own modes, and not + all user "levels" are allowed to change all channel modes ... . - See doc/Modes.txt for more information. + The mode parameters can become quite complex, especially when dealing + with channel modes that require additional arguments: + . + {+|-}<mode(s}> -- set or unset one or more modes. + +<mode(s)> -<mode(s)> -- set some modes and unset others. + +<modes> <arg1> <arg2> -- set (at least) two modes with arguments. + . + Some examples: + . + MODE nick +i -- set user to "invisible". + MODE #chan +tn -- set "topic lock" and "no external messages". + MODE #chan -t +l 50 -- remove "topic lock", set "user limit" to 50. + MODE #chan +ov nick1 nick2 -- set "channel op" and "voice" mode + to nick1 and nick2 in channel #chan. + . + A complete list of all modes supported by ngIRCd can be found online + here: <http://ngircd.barton.de/doc/Modes.txt>. + + References: + - RFC 2811, 4. "Channel Modes" + - RFC 2812, 3.1.5 "User mode message" + - RFC 2812, 3.2.3 "Channel mode message" + - <http://ngircd.barton.de/doc/Modes.txt> + - doc/Modes.txt - NOTICE NOTICE <target>[,<target>[,...]] <message> @@ -447,8 +481,13 @@ Status and Informational Commands - TRACE TRACE [<server>] . - Trace a path across the IRC network of the current server, or if given - of a specific <server>, in a similar method to traceroute. + Find the route to a specific server and send information about its + peers. Each server that processes this command reports back to the + sender about it: the replies from pass-through servers form a chain + which shows the route to the destination. + + References: + - RFC 2812, 3.4.8 "Trace message" - USERHOST USERHOST <nickname> [<nickname> [...]] @@ -541,13 +580,19 @@ Channel Commands - RFC 2812, 3.2.7 "Invite message" - JOIN - JOIN <channels> [<channel-keys>] + JOIN {<channel>[,<channel>[,...]] [<key>[,<key>[,...]]] | 0} . - Makes the client join the <channels> (comma-separated list), specifying - the passwords, if needed, in the comma-separated <channel-keys> list. - A <channel-key> is only needed, if the <channel> mode "+k" is set. + Makes the client join the <channel> (comma-separated list), specifying + the channel keys ("passwords"). A <channel-key> is only needed if the + <channel> has the mode "+k" set. . If the channel(s) do not exist, then they will be created. + . + Using "JOIN 0" parts all channels at once. + + References: + - RFC 2812, 3.2.1 "Join message" (client protocol) + - RFC 2813, 4.2.1 "Join message" (server protocol) - KICK KICK <channel>[,<channel>[,...]] <nickname>[,<nickname>[,...]] [<reason>] @@ -564,25 +609,38 @@ Channel Commands - RFC 2812, 3.2.8 "Kick command" - LIST - LIST [<channels> [<server>]] + LIST [<channel>[,<channel>[,...]] [<server>]] + . + List all visible <channels> (comma-seperated list). . - List all visible <channels> (comma-seperated list) on the current - server. If <server> is given, the command will be forwarded to <server> for evaluation. + References: + - RFC 2812, 3.2.6 "List message" + - PART - PART <channels> [<part-message>] + PART <channel>[,<channel>[,...]] [<part-message>] . - Leave <channels> (comma-separated list), optional with a - <part-message>. + Leave <channel> (comma-separated list), optionally with sending a + <part-message> to all the other channel members. + + References: + - RFC 2812, 3.2.2 "Part message" - TOPIC - TOPIC <channel> <topic> + TOPIC <channel> [<topic>] . - Set a <topic> for <channel>. + Cchange or view the topic of a channel. . - Only <channel> operators are able to set a <topic>. + The topic for channel <channel> is returned if there is no <topic> + given. If the <topic> parameter is present, the topic for that + channel will be changed, if this action is allowed for the user + requesting it. If the <topic> parameter is an empty string, the + topic for that channel will be removed. + + References: + - RFC 2812, 3.2.4 "Topic message" Administrative Commands

1 0

Alexander Barton : Update irc-mode.c to use irc-macros.h
by alex＠arthur.barton.de 02 Aug '13

02 Aug '13

Module: ngircd.git Branch: master Commit: 888c52468373e3680fa1138830643848675779e5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=888c5246… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 2 01:48:13 2013 +0200 Update irc-mode.c to use irc-macros.h This includes code cleanups and more comments, too. --- src/ngircd/irc-mode.c | 105 ++++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 765de39..a51369f 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2013 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ #include "defines.h" #include "conn.h" #include "channel.h" +#include "irc-macros.h" #include "irc-write.h" #include "lists.h" #include "log.h" @@ -35,7 +36,6 @@ #include "exp.h" #include "irc-mode.h" - static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target)); static bool Channel_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, @@ -50,16 +50,15 @@ static bool Send_ListChange PARAMS((const bool IsAdd, const char ModeChar, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Mask)); - /** * Handler for the IRC "MODE" command. * - * See RFC 2812 section 3.1.5 ("user mode message") and section 3.2.3 - * ("channel mode message"), and RFC 2811 section 4 ("channel modes"). + * This function detects whether user or channel modes should be modified + * and calls the apropriate sub-functions. * - * @param Client The client from which this command has been received. - * @param Req Request structure with prefix and all parameters. - * @returns CONNECTED or DISCONNECTED. + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_MODE( CLIENT *Client, REQUEST *Req ) @@ -70,20 +69,8 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) assert(Client != NULL); assert(Req != NULL); - /* No parameters? */ - if (Req->argc < 1) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); - - /* Origin for answers */ - if (Client_Type(Client) == CLIENT_SERVER) { - origin = Client_Search(Req->prefix); - if (!origin) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), - Req->prefix); - } else - origin = Client; + _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) + _IRC_GET_SENDER_OR_RETURN_(origin, Req, Client) /* Channel or user mode? */ cl = NULL; chan = NULL; @@ -102,7 +89,6 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) Client_ID(Client), Req->argv[0]); } /* IRC_MODE */ - /** * Check if the "mode limit" for a client has been reached. * @@ -123,15 +109,14 @@ Mode_Limit_Reached(CLIENT *Client, int Count) return true; } - /** * Handle client mode requests * - * @param Client The client from which this command has been received. - * @param Req Request structure with prefix and all parameters. - * @param Origin The originator of the MODE command (prefix). - * @param Target The target (client) of this MODE command. - * @returns CONNECTED or DISCONNECTED. + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @param Origin The originator of the MODE command (prefix). + * @param Target The target (client) of this MODE command. + * @return CONNECTED or DISCONNECTED. */ static bool Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) @@ -386,7 +371,13 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) return ok; } /* Client_Mode */ - +/* + * Reply to a channel mode request. + * + * @param Origin The originator of the MODE command (prefix). + * @param Channel The channel of which the modes should be sent. + * @return CONNECTED or DISCONNECTED. + */ static bool Channel_Mode_Answer_Request(CLIENT *Origin, CHANNEL *Channel) { @@ -432,9 +423,14 @@ Channel_Mode_Answer_Request(CLIENT *Origin, CHANNEL *Channel) return CONNECTED; } - /** * Handle channel mode and channel-user mode changes + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @param Origin The originator of the MODE command (prefix). + * @param Channel The target channel of this MODE command. + * @return CONNECTED or DISCONNECTED. */ static bool Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) @@ -941,31 +937,37 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) return connected; } /* Channel_Mode */ - +/** + * Handler for the IRC "AWAY" command. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_AWAY( CLIENT *Client, REQUEST *Req ) { - assert( Client != NULL ); - assert( Req != NULL ); - - if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - if(( Req->argc == 1 ) && (Req->argv[0][0] )) - { - Client_SetAway( Client, Req->argv[0] ); - Client_ModeAdd( Client, 'a' ); - IRC_WriteStrServersPrefix( Client, Client, "MODE %s :+a", Client_ID( Client )); - return IRC_WriteStrClient( Client, RPL_NOWAWAY_MSG, Client_ID( Client )); - } - else - { - Client_ModeDel( Client, 'a' ); - IRC_WriteStrServersPrefix( Client, Client, "MODE %s :-a", Client_ID( Client )); - return IRC_WriteStrClient( Client, RPL_UNAWAY_MSG, Client_ID( Client )); + assert (Client != NULL); + assert (Req != NULL); + + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1) + + if (Req->argc == 1 && Req->argv[0][0]) { + Client_SetAway(Client, Req->argv[0]); + Client_ModeAdd(Client, 'a'); + IRC_WriteStrServersPrefix(Client, Client, "MODE %s :+a", + Client_ID( Client)); + return IRC_WriteStrClient(Client, RPL_NOWAWAY_MSG, + Client_ID( Client)); + } else { + Client_ModeDel(Client, 'a'); + IRC_WriteStrServersPrefix(Client, Client, "MODE %s :-a", + Client_ID( Client)); + return IRC_WriteStrClient(Client, RPL_UNAWAY_MSG, + Client_ID( Client)); } } /* IRC_AWAY */ - /** * Add entries to channel invite, ban and exception lists. * @@ -1032,7 +1034,6 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, return Send_ListChange(true, what, Prefix, Client, Channel, mask); } - /** * Delete entries from channel invite, ban and exeption lists. * @@ -1076,7 +1077,6 @@ Del_From_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, return Send_ListChange(false, what, Prefix, Client, Channel, mask); } - /** * Send information about changed channel invite/ban/exception lists to clients. * @@ -1114,5 +1114,4 @@ Send_ListChange(const bool IsAdd, const char ModeChar, CLIENT *Prefix, return ok; } /* Send_ListChange */ - /* -eof- */

1 0

Alexander Barton : Update irc-channel.c to use irc-macros.h
by alex＠arthur.barton.de 02 Aug '13

02 Aug '13

Module: ngircd.git Branch: master Commit: ae0af66d504125104eca984f92449b2bd78bc192 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ae0af66d… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 2 01:46:57 2013 +0200 Update irc-channel.c to use irc-macros.h This includes code cleanups, too :-) --- src/ngircd/irc-channel.c | 230 ++++++++++++++++++---------------------------- 1 file changed, 91 insertions(+), 139 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=ae0a…

1 0

Alexander Barton : Commands.txt: Streamline references to IRC+ protocol
by alex＠arthur.barton.de 02 Aug '13

02 Aug '13

Module: ngircd.git Branch: master Commit: fef10f590b38371439c35b5e0a7f2e1a9a373a8a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fef10f59… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 2 01:42:31 2013 +0200 Commands.txt: Streamline references to IRC+ protocol --- doc/Commands.txt | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 7765d3a..30947c1 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -97,8 +97,8 @@ Connection Handling Commands clients using UTF-8, which should be the default today. References: - - <http://ngircd.barton.de/doc/Protocol.txt> - - doc/Protocol.txt + - IRC+, <http://ngircd.barton.de/doc/Protocol.txt> + - IRC+, doc/Protocol.txt - NICK NICK <nickname> @@ -129,7 +129,8 @@ Connection Handling Commands - RFC 1459, 4.1.1 "Password message" (old client and server protocol) - RFC 2812, 3.1.1 "Password message" (client protocol) - RFC 2813, 4.1.1 "Password message" (server protocol) - - doc/Protocol.txt + - IRC+, <http://ngircd.barton.de/doc/Protocol.txt> + - IRC+, doc/Protocol.txt - PING PING <token> [<target>] @@ -211,7 +212,8 @@ Connection Handling Commands unauthorized clients to fake their identity; it is an arbitrary string. References: - - doc/Protocol.txt, II.4: "Update webchat/proxy client information" + - IRC+, <http://ngircd.barton.de/doc/Protocol.txt> + - IRC+, doc/Protocol.txt General Commands @@ -739,8 +741,10 @@ Server Protocol Commands . CHANINFO is used by servers to inform each other about a channel: its modes, channel key, user limits and its topic. - . - See doc/Protocol.txt for more information. + + References: + - IRC+, <http://ngircd.barton.de/doc/Protocol.txt> + - IRC+, doc/Protocol.txt - ERROR ERROR [<message> [<> [...]]] @@ -764,8 +768,10 @@ Server Protocol Commands The METADATA command is used on server-links to update "metadata" information of clients, like the hostname, the info text ("real name"), or the user name. - . - See doc/Protocol.txt for more information. + + References: + - IRC+, <http://ngircd.barton.de/doc/Protocol.txt> + - IRC+, doc/Protocol.txt - NJOIN

1 0

Alexander Barton : Show IRC Operator name when logging a successful OPER command
by alex＠arthur.barton.de 01 Aug '13

01 Aug '13

Module: ngircd.git Branch: master Commit: 771e539c18669d6c20b557be79675b94ca191c59 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=771e539c… Author: Alexander Barton <alex(a)barton.de> Date: Thu Aug 1 00:24:10 2013 +0200 Show IRC Operator name when logging a successful OPER command --- src/ngircd/irc-oper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 237107f..29953a1 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -98,8 +98,8 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) if (!Client_OperByMe(Client)) Log(LOG_NOTICE|LOG_snotice, - "Got valid OPER from \"%s\", user is an IRC operator now.", - Client_Mask(Client)); + "Got valid OPER for \"%s\" from \"%s\", user is an IRC operator now.", + Req->argv[0], Client_Mask(Client)); Client_SetOperByMe(Client, true); return IRC_WriteStrClient(Client, RPL_YOUREOPER_MSG, Client_ID(Client));

1 0

Alexander Barton : Add more penalty times in error paths
by alex＠arthur.barton.de 30 Jul '13

30 Jul '13

Module: ngircd.git Branch: master Commit: 3bd973037a1664387161a465f801b78ff0180fa1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3bd97303… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jul 30 22:05:00 2013 +0200 Add more penalty times in error paths This patch changes the handlers of the "PASS", "NICK", "USER", and "SERVICE" commands to enforce a 2 second penalty when an error like "need more/other parameters" occurs. More functions should follow, I think ... --- src/ngircd/irc-login.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 27e11c4..cfb94f6 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -81,10 +81,12 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) } else if (Client_Type(Client) == CLIENT_UNKNOWN || Client_Type(Client) == CLIENT_UNKNOWNSERVER) { /* Unregistered connection, but wrong number of arguments: */ + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); } else { /* Registered connection, PASS command is not allowed! */ + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, Client_ID(Client)); } @@ -207,11 +209,12 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) Req->argv[0] ); } else { /* Is this a restricted client? */ - if( Client_HasMode( Client, 'r' )) + if (Client_HasMode(Client, 'r')) { + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client )); - + } target = Client; } @@ -487,10 +490,12 @@ IRC_USER(CLIENT * Client, REQUEST * Req) return CONNECTED; } else if (Client_Type(Client) == CLIENT_USER) { /* Already registered connection */ + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, Client_ID(Client)); } else { /* Unexpected/invalid connection state? */ + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_NOTREGISTERED_MSG, Client_ID(Client)); } @@ -518,9 +523,11 @@ IRC_SERVICE(CLIENT *Client, REQUEST *Req) assert(Req != NULL); if (Client_Type(Client) != CLIENT_GOTPASS && - Client_Type(Client) != CLIENT_SERVER) + Client_Type(Client) != CLIENT_SERVER) { + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, Client_ID(Client)); + } _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 6)

1 0

Alexander Barton : Add penalty times in error paths of generic IRC helper macros
by alex＠arthur.barton.de 30 Jul '13

30 Jul '13

Module: ngircd.git Branch: master Commit: 313881d0c1466e6b8f52b4456b66a2477ccba9cf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=313881d0… Author: Alexander Barton <alex(a)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.

1 0