ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Alexander Barton : Commands.txt: Update description of the "INVITE" command
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: be08349dcb2ed3e89040112a241e022ee802baa4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=be08349d… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 18:53:10 2013 +0100 Commands.txt: Update description of the "INVITE" command --- doc/Commands.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 2d3cab2..2967b43 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -419,14 +419,17 @@ Channel Commands ~~~~~~~~~~~~~~~~ - INVITE - INVITE <nick> <channel> + INVITE <nickname> <channel> . - Invites <nick> to <channel>. - <channel> does not have to exist, but if it does, only members of the - channel are allowed to invite other clients. + Invite <nickname> to join channel <channel>. . - If the <channel> mode "+i" is set, only <channel> operators may invite - other clients. + <channel> does not have to exist, but if it does, only members of the + channel are allowed to invite other users. If the channel mode "+i" + is set, only channel "half-ops" (and above) may invite other clients, + and if channel mode "+V" is set, nobody can invite other users. + + References: + - RFC 2812, 3.2.7 "Invite message" - JOIN JOIN <channels> [<channel-keys>]

1 0

Alexander Barton : Commands.txt: Update description of the "KICK" command
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: b25fd8a98ca48abdabfe52ce3bfdd00a8f9fc003 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b25fd8a9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 18:53:33 2013 +0100 Commands.txt: Update description of the "KICK" command --- doc/Commands.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 2967b43..92d25c7 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -441,11 +441,18 @@ Channel Commands If the channel(s) do not exist, then they will be created. - KICK - KICK <channel> <nick> [<kick-message>] + KICK <channel>[,<channel>[,...]] <nickname>[,<nickname>[,...]] [<reason>] . - Remove <nick> from <channel>, optional with a <kick-message>. + Remove users(s) with <nickname>(s) from <channel>(s). . - Only <channel> operators are able to KICK. + There must be either exactly one <channel> parameter and multiple + <nickname> parameters, or as many <channel> parameters as there are + <nickname> parameters. The <reason> is shown to the users being + kicked, and the nickname of the current user is used when <reason> + is omitted. + + References: + - RFC 2812, 3.2.8 "Kick command" - LIST LIST [<channels> [<server>]]

1 0

Alexander Barton : irc-cap.c: move static functions to the top of the file
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: a7b04ce6cff3613a45864a127dde082a1a4c6aec URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a7b04ce6… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 16:08:17 2013 +0100 irc-cap.c: move static functions to the top of the file And remove now unnecessary (local) prototypes. --- src/ngircd/irc-cap.c | 216 ++++++++++++++++++++++++-------------------------- 1 file changed, 104 insertions(+), 112 deletions(-) diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index af34c38..39d1b3c 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.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 @@ -33,60 +33,81 @@ #include "exp.h" #include "irc-cap.h" -bool Handle_CAP_LS PARAMS((CLIENT *Client, char *Arg)); -bool Handle_CAP_LIST PARAMS((CLIENT *Client, char *Arg)); -bool Handle_CAP_REQ PARAMS((CLIENT *Client, char *Arg)); -bool Handle_CAP_ACK PARAMS((CLIENT *Client, char *Arg)); -bool Handle_CAP_CLEAR PARAMS((CLIENT *Client)); -bool Handle_CAP_END PARAMS((CLIENT *Client)); +/* Local functions */ -void Set_CAP_Negotiation PARAMS((CLIENT *Client)); +/** + * Set CAP negotiation status and mark client as "supports capabilities". + * + * @param Client The client to handle. + */ +static void +Set_CAP_Negotiation(CLIENT *Client) +{ + assert(Client != NULL); -int Parse_CAP PARAMS((int Capabilities, char *Args)); -char *Get_CAP_String PARAMS((int Capabilities)); + if (Client_Type(Client) != CLIENT_USER) + Client_CapAdd(Client, CLIENT_CAP_PENDING); + Client_CapAdd(Client, CLIENT_CAP_SUPPORTED); +} /** - * Handler for the IRCv3 "CAP" command. + * Parse capability string and return numeric flag value. * - * @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 Args The string containing space-separated capability names. + * @return Changed capability flags or 0 on error. */ -GLOBAL bool -IRC_CAP(CLIENT *Client, REQUEST *Req) +static int +Parse_CAP(int Capabilities, char *Args) { - assert(Client != NULL); - assert(Req != NULL); + static char tmp[COMMAND_LEN]; + char *ptr; - /* Bad number of prameters? */ - if (Req->argc < 1 || Req->argc > 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + assert(Args != NULL); - LogDebug("Got \"%s %s\" command from \"%s\" ...", - Req->command, Req->argv[0], Client_ID(Client)); + strlcpy(tmp, Args, sizeof(tmp)); - if (Req->argc == 1) { - if (strcasecmp(Req->argv[0], "CLEAR") == 0) - return Handle_CAP_CLEAR(Client); - if (strcasecmp(Req->argv[0], "END") == 0) - return Handle_CAP_END(Client); - } - if (Req->argc >= 1 && Req->argc <= 2) { - if (strcasecmp(Req->argv[0], "LS") == 0) - return Handle_CAP_LS(Client, Req->argv[1]); - if (strcasecmp(Req->argv[0], "LIST") == 0) - return Handle_CAP_LIST(Client, Req->argv[1]); - } - if (Req->argc == 2) { - if (strcasecmp(Req->argv[0], "REQ") == 0) - return Handle_CAP_REQ(Client, Req->argv[1]); - if (strcasecmp(Req->argv[0], "ACK") == 0) - return Handle_CAP_ACK(Client, Req->argv[1]); + ptr = strtok(tmp, " "); + while (ptr) { + if (*ptr == '-') { + /* drop capabilities */ + ptr++; + if (strcmp(ptr, "multi-prefix") == 0) + Capabilities &= ~CLIENT_CAP_MULTI_PREFIX; + else + return -1; + } else { + /* request capabilities */ + if (strcmp(ptr, "multi-prefix") == 0) + Capabilities |= CLIENT_CAP_MULTI_PREFIX; + else + return -1; + } + ptr = strtok(NULL, " "); } - return IRC_WriteStrClient(Client, ERR_INVALIDCAP_MSG, - Client_ID(Client), Req->argv[0]); + return Capabilities; +} + +/** + * Return textual representation of capability flags. + * + * Please note: this function returns a pointer to a global buffer and + * therefore isn't thread safe! + * + * @param Capabilities Capability flags (bitmask). + * @return Pointer to textual representation. + */ +static char * +Get_CAP_String(int Capabilities) +{ + static char txt[COMMAND_LEN]; + + txt[0] = '\0'; + + if (Capabilities & CLIENT_CAP_MULTI_PREFIX) + strlcat(txt, "multi-prefix ", sizeof(txt)); + + return txt; } /** @@ -96,7 +117,7 @@ IRC_CAP(CLIENT *Client, REQUEST *Req) * @param Arg Command argument or NULL. * @returns CONNECTED or DISCONNECTED. */ -bool +static bool Handle_CAP_LS(CLIENT *Client, UNUSED char *Arg) { assert(Client != NULL); @@ -115,7 +136,7 @@ Handle_CAP_LS(CLIENT *Client, UNUSED char *Arg) * @param Arg Command argument or NULL. * @returns CONNECTED or DISCONNECTED. */ -bool +static bool Handle_CAP_LIST(CLIENT *Client, UNUSED char *Arg) { assert(Client != NULL); @@ -131,7 +152,7 @@ Handle_CAP_LIST(CLIENT *Client, UNUSED char *Arg) * @param Arg Command argument. * @returns CONNECTED or DISCONNECTED. */ -bool +static bool Handle_CAP_REQ(CLIENT *Client, char *Arg) { int new_cap; @@ -159,7 +180,7 @@ Handle_CAP_REQ(CLIENT *Client, char *Arg) * @param Arg Command argument. * @returns CONNECTED or DISCONNECTED. */ -bool +static bool Handle_CAP_ACK(UNUSED CLIENT *Client, UNUSED char *Arg) { assert(Client != NULL); @@ -174,7 +195,7 @@ Handle_CAP_ACK(UNUSED CLIENT *Client, UNUSED char *Arg) * @param Client The client from which this command has been received. * @returns CONNECTED or DISCONNECTED. */ -bool +static bool Handle_CAP_CLEAR(CLIENT *Client) { int cap_old; @@ -195,7 +216,7 @@ Handle_CAP_CLEAR(CLIENT *Client) * @param Client The client from which this command has been received. * @returns CONNECTED or DISCONNECTED. */ -bool +static bool Handle_CAP_END(CLIENT *Client) { assert(Client != NULL); @@ -213,79 +234,50 @@ Handle_CAP_END(CLIENT *Client) return CONNECTED; } -/** - * Set CAP negotiation status and mark client as "supports capabilities". - * - * @param Client The client to handle. - */ -void -Set_CAP_Negotiation(CLIENT *Client) -{ - assert(Client != NULL); - - if (Client_Type(Client) != CLIENT_USER) - Client_CapAdd(Client, CLIENT_CAP_PENDING); - Client_CapAdd(Client, CLIENT_CAP_SUPPORTED); -} +/* Global functions */ /** - * Parse capability string and return numeric flag value. + * Handler for the IRCv3 command "CAP". * - * @param Args The string containing space-separated capability names. - * @return Changed capability flags or 0 on error. + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ -int -Parse_CAP(int Capabilities, char *Args) +GLOBAL bool +IRC_CAP(CLIENT *Client, REQUEST *Req) { - static char tmp[COMMAND_LEN]; - char *ptr; + assert(Client != NULL); + assert(Req != NULL); - assert(Args != NULL); + /* Bad number of prameters? */ + if (Req->argc < 1 || Req->argc > 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - strlcpy(tmp, Args, sizeof(tmp)); + LogDebug("Got \"%s %s\" command from \"%s\" ...", + Req->command, Req->argv[0], Client_ID(Client)); - ptr = strtok(tmp, " "); - while (ptr) { - if (*ptr == '-') { - /* drop capabilities */ - ptr++; - if (strcmp(ptr, "multi-prefix") == 0) - Capabilities &= ~CLIENT_CAP_MULTI_PREFIX; - else - return -1; - } else { - /* request capabilities */ - if (strcmp(ptr, "multi-prefix") == 0) - Capabilities |= CLIENT_CAP_MULTI_PREFIX; - else - return -1; - } - ptr = strtok(NULL, " "); + if (Req->argc == 1) { + if (strcasecmp(Req->argv[0], "CLEAR") == 0) + return Handle_CAP_CLEAR(Client); + if (strcasecmp(Req->argv[0], "END") == 0) + return Handle_CAP_END(Client); + } + if (Req->argc >= 1 && Req->argc <= 2) { + if (strcasecmp(Req->argv[0], "LS") == 0) + return Handle_CAP_LS(Client, Req->argv[1]); + if (strcasecmp(Req->argv[0], "LIST") == 0) + return Handle_CAP_LIST(Client, Req->argv[1]); + } + if (Req->argc == 2) { + if (strcasecmp(Req->argv[0], "REQ") == 0) + return Handle_CAP_REQ(Client, Req->argv[1]); + if (strcasecmp(Req->argv[0], "ACK") == 0) + return Handle_CAP_ACK(Client, Req->argv[1]); } - return Capabilities; -} - -/** - * Return textual representation of capability flags. - * - * Please note: this function returns a pointer to a global buffer and - * therefore isn't thread safe! - * - * @param Capabilities Capability flags (bitmask). - * @return Pointer to textual representation. - */ -char * -Get_CAP_String(int Capabilities) -{ - static char txt[COMMAND_LEN]; - - txt[0] = '\0'; - - if (Capabilities & CLIENT_CAP_MULTI_PREFIX) - strlcat(txt, "multi-prefix ", sizeof(txt)); - - return txt; + return IRC_WriteStrClient(Client, ERR_INVALIDCAP_MSG, + Client_ID(Client), Req->argv[0]); } /* -eof- */

1 0

Alexander Barton : Add new _IRC_ARGC_BETWEEN_OR_RETURN_ macro to irc-macros .h
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: 883a8fa6f185033102748be6dde1b386ddef54ac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=883a8fa6… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 16:14:13 2013 +0100 Add new _IRC_ARGC_BETWEEN_OR_RETURN_ macro to irc-macros.h --- src/ngircd/irc-macros.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h index bd63ec4..87a6088 100644 --- a/src/ngircd/irc-macros.h +++ b/src/ngircd/irc-macros.h @@ -40,6 +40,17 @@ if (Req->argc < Min) \ Client_ID(Client), Req->command); /** + * Make sure that number of passed parameters is in between Min and Max. + * + * If there aren't at least Min parameters or if there are more than Max + * 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) \ + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \ + Client_ID(Client), Req->command); + +/** * Get sender of an IRC command. * * The sender is either stored in the prefix if the command has been

1 0

Alexander Barton : Add new _IRC_ARGC_EQ_OR_RETURN_ macro to irc-macros.h
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: 7f99f7c14f923c1e9aa8fe075a908c1e9e5b6239 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7f99f7c1… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 16:20:27 2013 +0100 Add new _IRC_ARGC_EQ_OR_RETURN_ macro to irc-macros.h --- src/ngircd/irc-macros.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h index 87a6088..f0c0f36 100644 --- a/src/ngircd/irc-macros.h +++ b/src/ngircd/irc-macros.h @@ -18,6 +18,17 @@ */ /** + * Make sure that number of passed parameters is equal to Count. + * + * If there are not exactly Count parameters, send an error to the client and + * return from the function. + */ +#define _IRC_ARGC_EQ_OR_RETURN_(Client, Req, Count) \ +if (Req->argc != Count) \ + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \ + Client_ID(Client), Req->command); + +/** * Make sure that number of passed parameters is less or equal than Max. * * If there are more than Max parameters, send an error to the client and

1 0

Alexander Barton : irc-cap.c: Update source code documentation
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: bb31d7b88cd11ceec65aed08a99ac9a2270ce3ef URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bb31d7b8… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 18:49:07 2013 +0100 irc-cap.c: Update source code documentation --- src/ngircd/irc-cap.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index 39d1b3c..52abcec 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -111,11 +111,11 @@ Get_CAP_String(int Capabilities) } /** - * Handler for the "CAP LS" command. + * Handler for the IRCv3 sub-command "CAP LS". * * @param Client The client from which this command has been received. * @param Arg Command argument or NULL. - * @returns CONNECTED or DISCONNECTED. + * @return CONNECTED or DISCONNECTED. */ static bool Handle_CAP_LS(CLIENT *Client, UNUSED char *Arg) @@ -130,11 +130,11 @@ Handle_CAP_LS(CLIENT *Client, UNUSED char *Arg) } /** - * Handler for the "CAP LIST" command. + * Handler for the IRCv3 sub-command "CAP LIST". * * @param Client The client from which this command has been received. * @param Arg Command argument or NULL. - * @returns CONNECTED or DISCONNECTED. + * @return CONNECTED or DISCONNECTED. */ static bool Handle_CAP_LIST(CLIENT *Client, UNUSED char *Arg) @@ -146,11 +146,11 @@ Handle_CAP_LIST(CLIENT *Client, UNUSED char *Arg) } /** - * Handler for the "CAP REQ" command. + * Handler for the IRCv3 sub-command "CAP REQ". * * @param Client The client from which this command has been received. * @param Arg Command argument. - * @returns CONNECTED or DISCONNECTED. + * @return CONNECTED or DISCONNECTED. */ static bool Handle_CAP_REQ(CLIENT *Client, char *Arg) @@ -174,11 +174,11 @@ Handle_CAP_REQ(CLIENT *Client, char *Arg) } /** - * Handler for the "CAP ACK" command. + * Handler for the IRCv3 sub-command "CAP ACK". * * @param Client The client from which this command has been received. * @param Arg Command argument. - * @returns CONNECTED or DISCONNECTED. + * @return CONNECTED or DISCONNECTED. */ static bool Handle_CAP_ACK(UNUSED CLIENT *Client, UNUSED char *Arg) @@ -190,10 +190,10 @@ Handle_CAP_ACK(UNUSED CLIENT *Client, UNUSED char *Arg) } /** - * Handler for the "CAP CLEAR" command. + * Handler for the IRCv3 sub-command "CAP CLEAR". * * @param Client The client from which this command has been received. - * @returns CONNECTED or DISCONNECTED. + * @return CONNECTED or DISCONNECTED. */ static bool Handle_CAP_CLEAR(CLIENT *Client) @@ -211,10 +211,10 @@ Handle_CAP_CLEAR(CLIENT *Client) } /** - * Handler for the "CAP END" command. + * Handler for the IRCv3 sub-command "CAP END". * * @param Client The client from which this command has been received. - * @returns CONNECTED or DISCONNECTED. + * @return CONNECTED or DISCONNECTED. */ static bool Handle_CAP_END(CLIENT *Client)

1 0

Alexander Barton : irc-op.c: Update source code documentation
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: e8f512bfe70a6c620e09aa221fb7058dc2c6687e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e8f512bf… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 18:50:12 2013 +0100 irc-op.c: Update source code documentation --- src/ngircd/irc-op.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 5c12faf..0297015 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2005 by Alexander Barton (alex(a)barton.de) + * 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 @@ -33,6 +33,7 @@ #include "exp.h" #include "irc-op.h" +/* Local functions */ static bool try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel, @@ -47,7 +48,15 @@ try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel, return true; } +/* Global functions */ +/** + * Handler for the IRC command "KICK". + * + * @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_KICK(CLIENT *Client, REQUEST *Req) { @@ -128,7 +137,13 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) return true; } /* IRC_KICK */ - +/** + * Handler for the IRC command "INVITE". + * + * @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_INVITE(CLIENT *Client, REQUEST *Req) { @@ -197,8 +212,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) } } - LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), Req->argv[0], Req->argv[1]); - + LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), + Req->argv[0], Req->argv[1]); /* * RFC 2812 says: @@ -226,5 +241,4 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) return CONNECTED; } /* IRC_INVITE */ - /* -eof- */

1 0

Alexander Barton : irc-cap.c: use irc-macros.h
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: a53de63ba7fcb4144f4fcc2db221556177528900 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a53de63b… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 18:51:43 2013 +0100 irc-cap.c: use irc-macros.h --- src/ngircd/irc-cap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index 52abcec..74c7322 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -24,6 +24,7 @@ #include "conn.h" #include "channel.h" #include "client-cap.h" +#include "irc-macros.h" #include "irc-write.h" #include "log.h" #include "login.h" @@ -249,10 +250,7 @@ IRC_CAP(CLIENT *Client, REQUEST *Req) assert(Client != NULL); assert(Req != NULL); - /* Bad number of prameters? */ - if (Req->argc < 1 || Req->argc > 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2) LogDebug("Got \"%s %s\" command from \"%s\" ...", Req->command, Req->argv[0], Client_ID(Client));

1 0

Alexander Barton : Update Doxygen configuration
by alex＠arthur.barton.de 22 Feb '13

22 Feb '13

Module: ngircd.git Branch: master Commit: bd1b72718758c7f49aaab31a1bb34018880c10aa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bd1b7271… Author: Alexander Barton <alex(a)barton.de> Date: Fri Feb 22 18:11:26 2013 +0100 Update Doxygen configuration --- doc/src/Doxyfile | 105 ++++++++--------------------------------------- doc/src/footer.inc.html | 2 +- 2 files changed, 18 insertions(+), 89 deletions(-) diff --git a/doc/src/Doxyfile b/doc/src/Doxyfile index 8afec5e..6d9ccb5 100644 --- a/doc/src/Doxyfile +++ b/doc/src/Doxyfile @@ -16,106 +16,55 @@ # Project related configuration options #--------------------------------------------------------------------------- -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. +DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = ngIRCd - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. +PROJECT_BRIEF = "Lightweight Internet Relay Chat server" +PROJECT_LOGO = "../../contrib/ngIRCd-Logo.gif" OUTPUT_DIRECTORY = . - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - STRIP_FROM_PATH = ../.. -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. - JAVADOC_AUTOBRIEF = YES - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - OPTIMIZE_OUTPUT_FOR_C = YES +TYPEDEF_HIDES_STRUCT = YES + +TAB_SIZE = 8 #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - EXTRACT_ALL = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - EXTRACT_STATIC = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory -# hierarchy in the documentation. The default is NO. - SHOW_DIRECTORIES = YES #--------------------------------------------------------------------------- -# configuration options related to the input files +# configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that -# contain documented source files. You may enter file names like "myfile.cpp" -# or directories like "/usr/src/myproject". Separate the files or directories -# with spaces. +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = YES -INPUT = ../../src - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = ../../src +INPUT_ENCODING = UTF-8 RECURSIVE = YES #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - SOURCE_BROWSER = YES - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - STRIP_CODE_COMMENTS = NO - -# If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# function all documented functions referencing it will be listed. - REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES then for each documented -# function all documented entities called/used by that function will be listed. - REFERENCES_RELATION = YES #--------------------------------------------------------------------------- @@ -123,19 +72,7 @@ REFERENCES_RELATION = YES #--------------------------------------------------------------------------- GENERATE_HTML = YES - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for each -# generated HTML page. If it is left blank doxygen will generate a standard -# footer. - HTML_FOOTER = footer.inc.html - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports JavaScript and -# DHTML is required (for instance Mozilla 1.0+, Firefox Netscape 6.0+, -# Internet explorer 5.0+, Konqueror, or Safari). - HTML_DYNAMIC_SECTIONS = YES GENERATE_DOCSET = NO @@ -151,14 +88,6 @@ GENERATE_PERLMOD = NO # Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - PREDEFINED = DEBUG ZLIB PAM ZEROCONF CONN_MODULE __client_c__ # -eof- diff --git a/doc/src/footer.inc.html b/doc/src/footer.inc.html index a3a9552..ba05dcf 100644 --- a/doc/src/footer.inc.html +++ b/doc/src/footer.inc.html @@ -1,6 +1,6 @@ <hr class="footer"> -<p> +<p style="text-align: center"> ngIRCd <a href="http://ngircd.barton.de/">Homepage</a>, <a href="http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git">GIT-Repository</a>,

1 0

Alexander Barton : src/testsuite/README: add whois-test.e
by alex＠arthur.barton.de 22 Feb '13

22 Feb '13

Module: ngircd.git Branch: master Commit: 0f0f4f41b88ac4473cd826f9e1027a04bbb51c8a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0f0f4f41… Author: Alexander Barton <alex(a)barton.de> Date: Fri Feb 15 22:54:32 2013 +0100 src/testsuite/README: add whois-test.e --- src/testsuite/README | 1 + 1 file changed, 1 insertion(+) diff --git a/src/testsuite/README b/src/testsuite/README index 8b695a1..c8a3917 100644 --- a/src/testsuite/README +++ b/src/testsuite/README @@ -97,3 +97,4 @@ server-link-test.e stress-A.e stress-B.e who-test.e +whois-test.e

1 0

Springe zur Seite:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates