- ngIRCd GIT Updates - lists.barton.de

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 : 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 '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 : "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 : 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 : New "login" source file
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: edfcc2f9d5b796fd30f60138591e4f96d54cfcf6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=edfcc2f9… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 31 15:38:46 2012 +0200 New "login" source file Rename Hello_User[_PostAuth] to Login_User[_PostAuth] and move it to the new login.c; and move cb_Read_Auth_Result(), too. This will enable further code to easily call Login_User() when required. --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 6 + src/ngircd/Makefile.am | 2 + src/ngircd/irc-login.c | 210 +-------------------- src/ngircd/login.c | 234 +++++++++++++++++++++++ src/ngircd/login.h | 25 +++ 5 files changed, 271 insertions(+), 206 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=edfc…

1 0

Alexander Barton : Implement core IRC capability handling and "CAP" command
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: bd3a7ccb158c9f2eac1af77804529b76d99c3e79 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bd3a7ccb… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 31 15:59:06 2012 +0200 Implement core IRC capability handling and "CAP" command This patch implements the core functions to support "IRC Capabilities" and the IRC "CAP" command as used by other servers and specified here: <http://www.leeh.co.uk/draft-mitchell-irc-capabilities-02.html>. It enables ngIRCd to support the defined handshake, but it doesn't implement any capabilities, so "CAP LS" and "CAP LIST" always return the empty set and "CAP REQ ..." always fails with "CAP NAK". --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 14 ++ doc/Capabilities.txt | 23 +++ doc/Makefile.am | 1 + src/ngircd/Makefile.am | 4 + src/ngircd/client-cap.c | 62 ++++++++ src/ngircd/client-cap.h | 28 ++++ src/ngircd/client.h | 3 +- src/ngircd/irc-cap.c | 192 +++++++++++++++++++++++ src/ngircd/irc-cap.h | 24 +++ src/ngircd/login.c | 5 + src/ngircd/messages.h | 1 + src/ngircd/parse.c | 2 + 12 files changed, 358 insertions(+), 1 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=bd3a…

1 0

Alexander Barton : Correctly handle "CAP END", new client type CLIENT_WAITCAPEND
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: da4c1ebe81bbd1335356ef40c91741b953c9f8d8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=da4c1ebe… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 31 16:37:31 2012 +0200 Correctly handle "CAP END", new client type CLIENT_WAITCAPEND --- src/ngircd/client.h | 1 + src/ngircd/irc-cap.c | 2 +- src/ngircd/login.c | 5 ++++- src/ngircd/parse.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ngircd/client.h b/src/ngircd/client.h index bdad9ce..4dbcc7a 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -29,6 +29,7 @@ #ifndef STRICT_RFC # define CLIENT_WAITAUTHPING 512 /* waiting for AUTH PONG from client */ #endif +#define CLIENT_WAITCAPEND 1024 /* waiting for "CAP END" command */ #define CLIENT_TYPE int diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index 926943c..956b359 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -180,7 +180,7 @@ Handle_CAP_END(CLIENT *Client) /* User is still logging in ... */ Client_CapDel(Client, CLIENT_CAP_PENDING); - if (Client_Type(Client) == CLIENT_GOTUSER) { + if (Client_Type(Client) == CLIENT_WAITCAPEND) { /* Only "CAP END" was missing: log in! */ return Login_User(Client); } diff --git a/src/ngircd/login.c b/src/ngircd/login.c index ad45219..3808997 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -80,8 +80,11 @@ Login_User(CLIENT * Client) #endif /* Still waiting for "CAP END" command? */ - if (Client_Cap(Client) & CLIENT_CAP_PENDING) + if (Client_Cap(Client) & CLIENT_CAP_PENDING) { + Client_SetType(Client, CLIENT_WAITCAPEND); + LogDebug("Connection %d: Waiting for CAP END ...", conn); return CONNECTED; + } #ifdef PAM if (!Conf_PAM) { diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 41e3872..66bfef5 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -114,7 +114,7 @@ static COMMAND My_Commands[] = { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 }, #endif #ifndef STRICT_RFC - { "CAP", IRC_CAP, CLIENT_UNKNOWN|CLIENT_GOTNICK|CLIENT_GOTPASS|CLIENT_GOTUSER|CLIENT_USER, 0, 0, 0 }, + { "CAP", IRC_CAP, 0xFFFF, 0, 0, 0 }, { "GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 }, { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 }, #endif

1 0

Alexander Barton : "CAP REQ" starts capability negotiation and delays user registration
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: 2327b17656b329d6210628f24c77f51533c05620 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2327b176… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 27 22:47:22 2012 +0200 "CAP REQ" starts capability negotiation and delays user registration New helper function Set_CAP_Negotiation(). --- src/ngircd/irc-cap.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index 956b359..c92a3f3 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -40,6 +40,9 @@ bool Handle_CAP_ACK PARAMS((CLIENT *Client, char *Arg)); bool Handle_CAP_CLEAR PARAMS((CLIENT *Client)); bool Handle_CAP_END PARAMS((CLIENT *Client)); +void Set_CAP_Negotiation PARAMS((CLIENT *Client)); + + /** * Handler for the IRCv3 "CAP" command. * @@ -96,10 +99,8 @@ Handle_CAP_LS(CLIENT *Client, UNUSED char *Arg) { assert(Client != NULL); - if (Client_Type(Client) != CLIENT_USER) - Client_CapAdd(Client, CLIENT_CAP_PENDING); + Set_CAP_Negotiation(Client); - Client_CapAdd(Client, CLIENT_CAP_SUPPORTED); return IRC_WriteStrClient(Client, "CAP %s LS :", Client_ID(Client)); } @@ -131,6 +132,8 @@ Handle_CAP_REQ(CLIENT *Client, char *Arg) assert(Client != NULL); assert(Arg != NULL); + Set_CAP_Negotiation(Client); + return IRC_WriteStrClient(Client, "CAP %s NAK :%s", Client_ID(Client), Arg); } @@ -189,4 +192,19 @@ 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); +} + /* -eof- */

1 0

Alexander Barton : New function Client_CapSet() in addition to Client_Cap{Add|Del}
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: 245782897b4a8ca092a87bf6d3961cbda1dea962 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=24578289… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 27 23:56:56 2012 +0200 New function Client_CapSet() in addition to Client_Cap{Add|Del} --- src/ngircd/client-cap.c | 11 +++++++++++ src/ngircd/client-cap.h | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/ngircd/client-cap.c b/src/ngircd/client-cap.c index edaf260..b0da807 100644 --- a/src/ngircd/client-cap.c +++ b/src/ngircd/client-cap.c @@ -38,6 +38,17 @@ Client_Cap(CLIENT *Client) } GLOBAL void +Client_CapSet(CLIENT *Client, int Cap) +{ + assert(Client != NULL); + assert(Cap >= 0); + + Client->capabilities = Cap; + LogDebug("Set new capability of \"%s\" to %d.", + Client_ID(Client), Client->capabilities); +} + +GLOBAL void Client_CapAdd(CLIENT *Client, int Cap) { assert(Client != NULL); diff --git a/src/ngircd/client-cap.h b/src/ngircd/client-cap.h index faec1c2..e477dc0 100644 --- a/src/ngircd/client-cap.h +++ b/src/ngircd/client-cap.h @@ -22,6 +22,7 @@ GLOBAL int Client_Cap PARAMS((CLIENT *Client)); +GLOBAL void Client_CapSet PARAMS((CLIENT *Client, int Cap)); GLOBAL void Client_CapAdd PARAMS((CLIENT *Client, int Cap)); GLOBAL void Client_CapDel PARAMS((CLIENT *Client, int Cap));

1 0