Februar 2013 - ngIRCd GIT Updates

Alexander Barton : doc/Services.txt: Update Anope status and URL
by alex＠arthur.barton.de 26 Feb '13

26 Feb '13

Module: ngircd.git Branch: master Commit: 3e3585708010cc0da22355aca84c9e79f8286e0b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3e358570… Author: Alexander Barton <alex(a)barton.de> Date: Tue Feb 26 09:38:27 2013 +0100 doc/Services.txt: Update Anope status and URL --- doc/Services.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Services.txt b/doc/Services.txt index f51bd48..dc0872f 100644 --- a/doc/Services.txt +++ b/doc/Services.txt @@ -44,10 +44,10 @@ Example: Setting up Anope 1.9.x ~~~~~~~~~~~~~~~~~~~~~~ -Anope 1.9.8 or later (<http://www.anope.org/>; unreleased as of 2012-11-10) +Anope 1.9.8 or later (<http://www.anope.org/>; unreleased as of 2013-02-26) may be used with ngIRCd using the "ngircd" protocol module. Until Anope 1.9.8 is released, you have to use the sources from the Anope -development GIT tree, see <http://sourceforge.net/projects/anope/develop/>! +development GIT tree, see <http://github.com/anope/anope>! At least the following settings have to be tweaked, in addition to all the settings marked as required by Anope:

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 : 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 : irc-op.c: use irc-macros.h
by alex＠arthur.barton.de 24 Feb '13

24 Feb '13

Module: ngircd.git Branch: master Commit: 3228f1b2677e6edd1b0cfe81ac31069914ecd61b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3228f1b2… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 24 18:51:54 2013 +0100 irc-op.c: use irc-macros.h --- src/ngircd/irc-op.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 0297015..23fcc71 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -24,6 +24,7 @@ #include "defines.h" #include "conn.h" #include "channel.h" +#include "irc-macros.h" #include "irc-write.h" #include "lists.h" #include "log.h" @@ -69,9 +70,8 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) assert( Client != NULL ); assert( Req != NULL ); - if ((Req->argc < 2) || (Req->argc > 3)) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 2, 3) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) while (*itemList) { if (*itemList == ',') { @@ -90,15 +90,6 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) itemList++; } - if (Client_Type(Client) == CLIENT_SERVER) - from = Client_Search(Req->prefix); - else - from = Client; - - if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->prefix); - reason = Req->argc == 3 ? Req->argv[2] : Client_ID(from); currentNick = Req->argv[1]; currentChannel = Req->argv[0]; @@ -155,17 +146,8 @@ IRC_INVITE(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); - - if (Client_Type(Client) == CLIENT_SERVER) - from = Client_Search(Req->prefix); - else - from = Client; - if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->prefix); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) /* Search user */ target = Client_Search(Req->argv[0]);

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 : 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: 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 : 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 : 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 : 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