ngIRCd GIT Updates April 2012

ngircd-commits@lists.barton.de

1 Teilnehmer
22 Diskussionen

Alexander Barton : doc/Platforms.txt: add "armv7l/unknown/linux-gnueabi"
by alex＠arthur.barton.de 29 Apr '12

29 Apr '12

Module: ngircd.git Branch: master Commit: 884c5bcff1dc1f4fb0e41b12af76d56db28d7de3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=884c5bcf… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 29 22:45:46 2012 +0200 doc/Platforms.txt: add "armv7l/unknown/linux-gnueabi" --- doc/Platforms.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 2f71038..bb13200 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -26,6 +26,7 @@ list can be updated. Thanks for your help! Platform Compiler ngIRCd Date Tester C M T R See --------------------------- ------------ ---------- -------- ------ - - - - --- alpha/unknown/netbsd3.0 gcc 3.3.3 CVSHEAD 06-05-07 fw Y Y Y Y (3) +armv7l/unkn./linux-gnueabi gcc 4.4.3 19.1 12-04-29 goetz Y Y Y Y (5) hppa/unknown/openbsd3.5 gcc 2.95.3 CVSHEAD 04-05-25 alex Y Y Y Y hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y hppa2.0/unknown/linux-gnu gcc 3.3.5 13~rc1 08-12-02 alex Y Y Y Y

1 0

William Pitcock : Add instructions for setting up Atheme.
by alex＠arthur.barton.de 29 Apr '12

29 Apr '12

Module: ngircd.git Branch: master Commit: 3a2fcc32cd60822bf08c8e3e75061791e0abbf9d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3a2fcc32… Author: William Pitcock <nenolod(a)dereferenced.org> Date: Sun Apr 29 17:36:10 2012 +0000 Add instructions for setting up Atheme. --- doc/Services.txt | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/doc/Services.txt b/doc/Services.txt index c2059b2..944afd4 100644 --- a/doc/Services.txt +++ b/doc/Services.txt @@ -14,8 +14,9 @@ But services acting as a "regular server" are supported, either using the IRC protocol defined in RFC 1459 or RFC 2812. Support for Services has been tested using "IRC Services" version 5.x by -Andrew Church (<http://achurch.org/services/>), and a Anope 1.9 using a -preliminary protocol module for ngIRCd (<http://www.anope.org/>). +Andrew Church (<http://achurch.org/services/>), Anope 1.9 using a +preliminary protocol module for ngIRCd (<http://www.anope.org/>), and +Atheme 7.0.2 or later. This document describes setting up ngIRCd and these services. @@ -93,5 +94,24 @@ The documentation of IRC Services can be found here: <http://www.ircservices.za.net/docs/> +Setting up Atheme 7.0.2 or later +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Atheme 7.0.2 or later may be used with ngIRCd using the "ngircd" protocol +module. + +The following settings need to be in atheme.conf: + +loadmodule "modules/protocol/ngircd"; + +uplink "server.irc.net" { + password = "123abc"; + port = 6667; +}; + +The documentation of Atheme can be found in the doc/ directory of the +Atheme source distribution. + + Please let us know if you are successfully using other IRC service packages or which problems you encounter, thanks!

1 0

Alexander Barton : irc-cap.c: mark arguments of Handle_CAP_ACK() as "unused "
by alex＠arthur.barton.de 29 Apr '12

29 Apr '12

Module: ngircd.git Branch: master Commit: a8aa8c6cbced060890ba1203c8a360b70ef0c98c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a8aa8c6c… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 29 12:39:28 2012 +0200 irc-cap.c: mark arguments of Handle_CAP_ACK() as "unused" This fixes irc-cap.c: In function ‘Handle_CAP_ACK’: irc-cap.c:163: warning: unused parameter ‘Client’ irc-cap.c:163: warning: unused parameter ‘Arg’ --- src/ngircd/irc-cap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index a6923ac..2ea4c9a 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -160,7 +160,7 @@ Handle_CAP_REQ(CLIENT *Client, char *Arg) * @returns CONNECTED or DISCONNECTED. */ bool -Handle_CAP_ACK(CLIENT *Client, char *Arg) +Handle_CAP_ACK(UNUSED CLIENT *Client, UNUSED char *Arg) { assert(Client != NULL); assert(Arg != NULL);

1 0

Alexander Barton : irc-login.c, login.c: add missing include of "string.h"
by alex＠arthur.barton.de 29 Apr '12

29 Apr '12

Module: ngircd.git Branch: master Commit: f01b09ce847b6895c84be378a324482170d3b56f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f01b09ce… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 29 12:36:23 2012 +0200 irc-login.c, login.c: add missing include of "string.h" This fixes the following warnings with GCC 4.4.5 on Linux: irc-login.c: In function ‘IRC_PASS’: irc-login.c:92: warning: implicit declaration of function ‘strlen’ irc-login.c:92: warning: incompatible implicit declaration of built-in function ‘strlen’ irc-login.c:113: warning: incompatible implicit declaration of built-in function ‘strlen’ irc-login.c:129: warning: implicit declaration of function ‘strchr’ irc-login.c:129: warning: incompatible implicit declaration of built-in function ‘strchr’ irc-login.c:133: warning: implicit declaration of function ‘strcmp’ irc-login.c: In function ‘IRC_SERVICE’: irc-login.c:556: warning: incompatible implicit declaration of built-in function ‘strchr’ login.c: In function ‘Login_User’: login.c:131: warning: implicit declaration of function ‘strcmp’ --- src/ngircd/irc-login.c | 1 + src/ngircd/login.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index bf3254c..6c1c708 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -19,6 +19,7 @@ #include "imp.h" #include <assert.h> #include <stdlib.h> +#include <string.h> #include <strings.h> #include "conn-func.h" diff --git a/src/ngircd/login.c b/src/ngircd/login.c index 3808997..7f0299c 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -19,6 +19,7 @@ #include "imp.h" #include <assert.h> #include <stdlib.h> +#include <string.h> #include <strings.h> #include <unistd.h>

1 0

Alexander Barton : doc/Modes.txt: Document missing channel mode "e"
by alex＠arthur.barton.de 29 Apr '12

29 Apr '12

Module: ngircd.git Branch: master Commit: 2419a701d8d255275e731c8bcd594d92a46b7067 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2419a701… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 29 12:11:50 2012 +0200 doc/Modes.txt: Document missing channel mode "e" --- doc/Modes.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/doc/Modes.txt b/doc/Modes.txt index 0b0e488..e47e270 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -43,6 +43,7 @@ users to lists (e.g. "invite list", "ban list"), others have parameters mode since description b 0.5.0 Add/remove a host mask to the ban list. + e 19 Add/remove a host mask to the exception list. i 0.5.0 Channel is "invite only". I 0.5.0 Add/remove a host mask to the invite list. k 0.6.0 Channel has a "key" (a password).

1 0

Alexander Barton : Merge branch 'master' of /srv/git/ngircd
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: 110be707c306683c666bd736a8dcd7aef86d9f21 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=110be707… Author: Alexander Barton <alex(a)barton.de> Date: Sat Apr 28 01:00:34 2012 +0200 Merge branch 'master' of /srv/git/ngircd * 'master' of /srv/git/ngircd: "multi-prefix" capability 2/2: adjust NAME and WHO handlers "multi-prefix" capability 1/2: implement complete CAP infrastructure IRC_Send_NAMES(): Code cleanup New function Client_CapSet() in addition to Client_Cap{Add|Del} "CAP REQ" starts capability negotiation and delays user registration Xcode: update project file for Xcode 4.3 Correctly handle "CAP END", new client type CLIENT_WAITCAPEND Implement core IRC capability handling and "CAP" command New "login" source file Introduce_Client() => Client_Introduce(), and move it to client.c ---

1 0

Alexander Barton : contrib/platformtest.sh: support "CC=xxx MAKE=yyy ./ platformtest.sh"
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: b2743af0ed438798f3025e253b157257b9774bd5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b2743af0… Author: Alexander Barton <alex(a)barton.de> Date: Sat Apr 28 00:58:23 2012 +0200 contrib/platformtest.sh: support "CC=xxx MAKE=yyy ./platformtest.sh" Now you can use contrib/platformtest.sh on platforms that require a "special" make (not "make") or compiler (not cc/gcc) binary. --- contrib/platformtest.sh | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 201ed41..afe9420 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2010 Alexander Barton <alex(a)barton.de> +# Copyright (c)2001-2011 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 @@ -21,13 +21,16 @@ PLATFORM= COMPILER="unknown" VERSION="unknown" DATE=`date "+%y-%m-%d"` - -CONFIGURE= -MAKE= -CHECK= -RUN= COMMENT= +R_CONFIGURE= +R_MAKE= +R_CHECK= +R_RUN= + +[ -n "$MAKE" ] || MAKE="make" +export MAKE CC + while [ $# -gt 0 ]; do case "$1" in "-v") @@ -61,20 +64,20 @@ if [ -r ./configure ]; then echo "$NAME: Running \"./configure\" script ..." [ -n "$VERBOSE" ] && ./configure || ./configure >/dev/null if [ $? -eq 0 -a -r ./Makefile ]; then - CONFIGURE=1 - echo "$NAME: Running \"make\" ..." - [ -n "$VERBOSE" ] && make || make >/dev/null + R_CONFIGURE=1 + echo "$NAME: Running \"$MAKE\" ..." + [ -n "$VERBOSE" ] && "$MAKE" || "$MAKE" >/dev/null if [ $? -eq 0 -a -x src/ngircd/ngircd ]; then - MAKE=1 - echo "$NAME: Running \"make check\" ..." - [ -n "$VERBOSE" ] && make check || make check >/dev/null + R_MAKE=1 + echo "$NAME: Running \"$MAKE check\" ..." + [ -n "$VERBOSE" ] && "$MAKE" check || "$MAKE" check >/dev/null if [ $? -eq 0 ]; then - CHECK=1 - RUN=$CHECK + R_CHECK=1 + R_RUN=$R_CHECK else ./src/ngircd/ngircd --help 2>/dev/null \ | grep "^ngircd" >/dev/null - [ $? -eq 0 ] && RUN=1 + [ $? -eq 0 ] && R_RUN=1 fi fi fi @@ -135,10 +138,10 @@ else [ $? -eq 0 ] && COMMENT="(3)" fi -[ -n "$CONFIGURE" ] && C="Y" || C="N" -[ -n "$MAKE" ] && M="Y" || M="N" -[ -n "$CHECK" ] && T="Y" || T="N" -[ -n "$RUN" ] && R="Y" || R="N" +[ -n "$R_CONFIGURE" ] && C="Y" || C="N" +[ -n "$R_MAKE" ] && M="Y" || M="N" +[ -n "$R_CHECK" ] && T="Y" || T="N" +[ -n "$R_RUN" ] && R="Y" || R="N" [ -n "$COMMENT" ] && COMMENT=" $COMMENT" echo

1 0

Alexander Barton : Merge branch 'capabilities'
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: 76565022fbda9a4054d7f74a46439db4145e5655 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=76565022… Author: Alexander Barton <alex(a)barton.de> Date: Sat Apr 28 00:49:37 2012 +0200 Merge branch 'capabilities' * capabilities: "multi-prefix" capability 2/2: adjust NAME and WHO handlers "multi-prefix" capability 1/2: implement complete CAP infrastructure IRC_Send_NAMES(): Code cleanup New function Client_CapSet() in addition to Client_Cap{Add|Del} "CAP REQ" starts capability negotiation and delays user registration Correctly handle "CAP END", new client type CLIENT_WAITCAPEND Implement core IRC capability handling and "CAP" command New "login" source file Introduce_Client() => Client_Introduce(), and move it to client.c ---

1 0

Alexander Barton : "multi-prefix" capability 2/2: adjust NAME and WHO handlers
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: 4602cb9891a0234e391d56ac4b2491d134020f1b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4602cb98… Author: Alexander Barton <alex(a)barton.de> Date: Sat Apr 28 00:38:51 2012 +0200 "multi-prefix" capability 2/2: adjust NAME and WHO handlers The NAME and WHO commands now return multiple usermode prfixes when the "multi-prefix" capability is in effect for the requesting client. See <http://ircv3.atheme.org/extensions/multi-prefix-3.1> --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 2 +- src/ngircd/irc-info.c | 29 +++++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index d89d379..23026c6 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -682,7 +682,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0420; + LastUpgradeCheck = 0430; }; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "ngIRCd" */; compatibilityVersion = "Xcode 3.2"; diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 38b9a7d..0ea8587 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -39,6 +39,7 @@ #include "parse.h" #include "irc.h" #include "irc-write.h" +#include "client-cap.h" #include "exp.h" #include "irc-info.h" @@ -807,8 +808,16 @@ who_flags_status(const char *client_modes) static const char * -who_flags_qualifier(const char *chan_user_modes) +who_flags_qualifier(CLIENT *Client, const char *chan_user_modes) { + assert(Client != NULL); + + if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX) { + if (strchr(chan_user_modes, 'o') && + strchr(chan_user_modes, 'v')) + return "@+"; + } + if (strchr(chan_user_modes, 'o')) return "@"; else if (strchr(chan_user_modes, 'v')) @@ -865,7 +874,7 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) strlcat(flags, "*", sizeof(flags)); chan_user_modes = Channel_UserModes(Chan, c); - strlcat(flags, who_flags_qualifier(chan_user_modes), + strlcat(flags, who_flags_qualifier(c, chan_user_modes), sizeof(flags)); if (!write_whoreply(Client, c, Channel_Name(Chan), @@ -1078,7 +1087,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) if (str[strlen(str) - 1] != ':') strlcat(str, " ", sizeof(str)); - strlcat(str, who_flags_qualifier(Channel_UserModes(chan, c)), + strlcat(str, who_flags_qualifier(c, Channel_UserModes(chan, c)), sizeof(str)); strlcat(str, Channel_Name(chan), sizeof(str)); @@ -1569,10 +1578,16 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan) if (is_member || is_visible) { if (str[strlen(str) - 1] != ':') strlcat(str, " ", sizeof(str)); - if (strchr(Channel_UserModes(Chan, cl), 'o')) - strlcat(str, "@", sizeof(str)); - else if (strchr(Channel_UserModes(Chan, cl), 'v')) - strlcat(str, "+", sizeof(str)); + if (Client_Cap(cl) & CLIENT_CAP_MULTI_PREFIX) { + if (strchr(Channel_UserModes(Chan, cl), 'o') && + strchr(Channel_UserModes(Chan, cl), 'v')) + strlcat(str, "@+", sizeof(str)); + } else { + if (strchr(Channel_UserModes(Chan, cl), 'o')) + strlcat(str, "@", sizeof(str)); + else if (strchr(Channel_UserModes(Chan, cl), 'v')) + strlcat(str, "+", sizeof(str)); + } strlcat(str, Client_ID(cl), sizeof(str)); if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) {

1 0

Alexander Barton : "multi-prefix" capability 1/2: implement complete CAP infrastructure
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: 1d7e99531a6f713a04bbc91a6f7f2963c9ece75c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1d7e9953… Author: Alexander Barton <alex(a)barton.de> Date: Sat Apr 28 00:36:41 2012 +0200 "multi-prefix" capability 1/2: implement complete CAP infrastructure Now ngIRCd is able to handle "CAP LS", "CAP REQ", "CAP LIST", and "CAP CLEAR" commands. "multi-prefix" can be set/unset, but has no functionality - yet! --- src/ngircd/client-cap.h | 2 + src/ngircd/irc-cap.c | 89 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 87 insertions(+), 4 deletions(-) diff --git a/src/ngircd/client-cap.h b/src/ngircd/client-cap.h index e477dc0..5532d33 100644 --- a/src/ngircd/client-cap.h +++ b/src/ngircd/client-cap.h @@ -20,6 +20,8 @@ #define CLIENT_CAP_PENDING 1 /* Capability negotiation pending */ #define CLIENT_CAP_SUPPORTED 2 /* Client supports IRC capabilities */ +#define CLIENT_CAP_MULTI_PREFIX 4 /* multi-prefix */ + GLOBAL int Client_Cap PARAMS((CLIENT *Client)); GLOBAL void Client_CapSet PARAMS((CLIENT *Client, int Cap)); diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index c92a3f3..a6923ac 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -42,6 +42,8 @@ bool Handle_CAP_END PARAMS((CLIENT *Client)); void Set_CAP_Negotiation PARAMS((CLIENT *Client)); +int Parse_CAP PARAMS((int Capabilities, char *Args)); +char *Get_CAP_String PARAMS((int Capabilities)); /** * Handler for the IRCv3 "CAP" command. @@ -101,7 +103,9 @@ Handle_CAP_LS(CLIENT *Client, UNUSED char *Arg) Set_CAP_Negotiation(Client); - return IRC_WriteStrClient(Client, "CAP %s LS :", Client_ID(Client)); + return IRC_WriteStrClient(Client, + "CAP %s LS :multi-prefix", + Client_ID(Client)); } /** @@ -116,7 +120,8 @@ Handle_CAP_LIST(CLIENT *Client, UNUSED char *Arg) { assert(Client != NULL); - return IRC_WriteStrClient(Client, "CAP %s LIST :", Client_ID(Client)); + return IRC_WriteStrClient(Client, "CAP %s LIST :%s", Client_ID(Client), + Get_CAP_String(Client_Cap(Client))); } /** @@ -129,12 +134,21 @@ Handle_CAP_LIST(CLIENT *Client, UNUSED char *Arg) bool Handle_CAP_REQ(CLIENT *Client, char *Arg) { + int new_cap; + assert(Client != NULL); assert(Arg != NULL); Set_CAP_Negotiation(Client); - return IRC_WriteStrClient(Client, "CAP %s NAK :%s", + new_cap = Parse_CAP(Client_Cap(Client), Arg); + + if (new_cap < 0) + return IRC_WriteStrClient(Client, "CAP %s NAK :%s", + Client_ID(Client), Arg); + + Client_CapSet(Client, new_cap); + return IRC_WriteStrClient(Client, "CAP %s ACK :%s", Client_ID(Client), Arg); } @@ -163,9 +177,16 @@ Handle_CAP_ACK(CLIENT *Client, char *Arg) bool Handle_CAP_CLEAR(CLIENT *Client) { + int cap_old; + assert(Client != NULL); - return IRC_WriteStrClient(Client, "CAP %s ACK :", Client_ID(Client)); + cap_old = Client_Cap(Client); + if (cap_old & CLIENT_CAP_MULTI_PREFIX) + Client_CapDel(Client, CLIENT_CAP_MULTI_PREFIX); + + return IRC_WriteStrClient(Client, "CAP %s ACK :%s", Client_ID(Client), + Get_CAP_String(cap_old)); } /** @@ -207,4 +228,64 @@ Set_CAP_Negotiation(CLIENT *Client) Client_CapAdd(Client, CLIENT_CAP_SUPPORTED); } +/** + * Parse capability string and return numeric flag value. + * + * @param Args The string containing space-separated capability names. + * @return Changed capability flags or 0 on error. + */ +int +Parse_CAP(int Capabilities, char *Args) +{ + static char tmp[COMMAND_LEN]; + char *ptr; + + assert(Args != NULL); + + strlcpy(tmp, Args, sizeof(tmp)); + + 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 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; +} + /* -eof- */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates April 2012