- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Implement METADATA command to update client metadata
by alex＠arthur.barton.de 07 Nov '12

07 Nov '12

Module: ngircd.git Branch: master Commit: 35ed57e6c160dc13c2bbca2ca042406285d4ced3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=35ed57e6… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 5 23:34:21 2012 +0100 Implement METADATA command to update client metadata The METADATA command can be used by other servers to update "metadata" of registered clients, like the client info text ("real name"), user name, and hostname: :<prefix> METADATA <target> <key> :<value> It is distributed in the network, unknown <key> names are silently ignored and passed on, too. This allows for further extensions. --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 6 ++ src/ngircd/defines.h | 2 +- src/ngircd/irc-metadata.c | 94 +++++++++++++++++++++++ src/ngircd/irc-metadata.h | 24 ++++++ src/ngircd/parse.c | 2 + 5 files changed, 127 insertions(+), 1 deletion(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index b904c76..e4722bd 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -36,6 +36,7 @@ FA322DBE0CEF7766001761B3 /* tool.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322D330CEF74B1001761B3 /* tool.c */; }; FA322DC10CEF77CB001761B3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FA322DC00CEF77CB001761B3 /* libz.dylib */; }; FA407F2E0DB159F400271AF1 /* ng_ipaddr.c in Sources */ = {isa = PBXBuildFile; fileRef = FA407F2C0DB159F400271AF1 /* ng_ipaddr.c */; }; + FA4F165A164836B100DBD011 /* irc-metadata.c in Sources */ = {isa = PBXBuildFile; fileRef = FA4F1659164836B100DBD011 /* irc-metadata.c */; }; FA6BBC631605F0AC0004247A /* conn-encoding.c in Sources */ = {isa = PBXBuildFile; fileRef = FA6BBC5F1605F0AB0004247A /* conn-encoding.c */; }; FA6BBC641605F0AC0004247A /* irc-encoding.c in Sources */ = {isa = PBXBuildFile; fileRef = FA6BBC611605F0AC0004247A /* irc-encoding.c */; }; FA6BBC661605F6D60004247A /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FA6BBC651605F6D60004247A /* libiconv.dylib */; }; @@ -206,6 +207,8 @@ FA4B08E613E7F91700765BA3 /* ngIRCd-Logo.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "ngIRCd-Logo.gif"; sourceTree = "<group>"; }; FA4B08E713E7F91700765BA3 /* ngircd-redhat.init */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "ngircd-redhat.init"; sourceTree = "<group>"; }; FA4B08E813E7F91C00765BA3 /* platformtest.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = platformtest.sh; sourceTree = "<group>"; }; + FA4F1659164836B100DBD011 /* irc-metadata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "irc-metadata.c"; sourceTree = "<group>"; }; + FA4F165C164836BF00DBD011 /* irc-metadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "irc-metadata.h"; sourceTree = "<group>"; }; FA6BBC5F1605F0AB0004247A /* conn-encoding.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "conn-encoding.c"; sourceTree = "<group>"; }; FA6BBC601605F0AC0004247A /* conn-encoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "conn-encoding.h"; sourceTree = "<group>"; }; FA6BBC611605F0AC0004247A /* irc-encoding.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "irc-encoding.c"; sourceTree = "<group>"; }; @@ -365,6 +368,8 @@ FA322CEF0CEF74B1001761B3 /* irc-info.h */, FA322CF00CEF74B1001761B3 /* irc-login.c */, FA322CF10CEF74B1001761B3 /* irc-login.h */, + FA4F1659164836B100DBD011 /* irc-metadata.c */, + FA4F165C164836BF00DBD011 /* irc-metadata.h */, FA322CF20CEF74B1001761B3 /* irc-mode.c */, FA322CF30CEF74B1001761B3 /* irc-mode.h */, FA322CF40CEF74B1001761B3 /* irc-op.c */, @@ -766,6 +771,7 @@ FAD5853815272C2600328741 /* login.c in Sources */, FA6BBC631605F0AC0004247A /* conn-encoding.c in Sources */, FA6BBC641605F0AC0004247A /* irc-encoding.c in Sources */, + FA4F165A164836B100DBD011 /* irc-metadata.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 49abf57..b2de98d 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -157,7 +157,7 @@ #ifdef IRCPLUS /** Standard IRC+ flags. */ -# define IRCPLUSFLAGS "CHLS" +# define IRCPLUSFLAGS "CHLMS" #endif /** Supported user modes. */ diff --git a/src/ngircd/irc-metadata.c b/src/ngircd/irc-metadata.c new file mode 100644 index 0000000..5cef833 --- /dev/null +++ b/src/ngircd/irc-metadata.c @@ -0,0 +1,94 @@ +/* + * ngIRCd -- The Next Generation IRC Daemon + * Copyright (c)2001-2012 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. + */ + +#define __irc_metadata_c__ + +#include "portab.h" + +/** + * @file + * IRC metadata commands + */ + +#include "imp.h" +#include <assert.h> +#include <string.h> +#include <stdio.h> + +#include "conn-func.h" +#include "channel.h" +#include "conn-encoding.h" +#include "irc-write.h" +#include "log.h" +#include "messages.h" +#include "parse.h" +#include "tool.h" + +#include "exp.h" +#include "irc-metadata.h" + +/** + * Handler for the IRC+ "METADATA" command. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @returns CONNECTED or DISCONNECTED. + */ +GLOBAL bool +IRC_METADATA(CLIENT *Client, REQUEST *Req) +{ + CLIENT *prefix, *target; + char new_flags[COMMAND_LEN]; + + assert(Client != NULL); + assert(Req != NULL); + + if (Req->argc != 3) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + prefix = Client_Search(Req->prefix); + if (!prefix) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); + + target = Client_Search(Req->argv[0]); + if (!target) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->argv[0]); + + LogDebug("Got \"METADATA\" command from \"%s\" for client \"%s\": \"%s=%s\".", + Client_ID(Client), Client_ID(target), + Req->argv[1], Req->argv[2]); + + /* Mark client: it has receiveda a METADATA command */ + if (!strchr(Client_Flags(target), 'M')) { + snprintf(new_flags, sizeof new_flags, "%sM", + Client_Flags(target)); + Client_SetFlags(target, new_flags); + } + + if (*Req->argv[2] && strcasecmp(Req->argv[1], "host") == 0) + Client_SetHostname(target, Req->argv[2]); + else if (strcasecmp(Req->argv[1], "info") == 0) + Client_SetInfo(target, Req->argv[2]); + else if (*Req->argv[2] && strcasecmp(Req->argv[1], "user") == 0) + Client_SetUser(target, Req->argv[2], true); + else + Log(LOG_WARNING, + "Ignored metadata update from \"%s\" for client \"%s\": \"%s=%s\" - unknown key!", + Client_ID(Client), Client_ID(target), + Req->argv[1], Req->argv[2]); + + IRC_WriteStrServersPrefixFlag(Client, prefix, 'M', "METADATA %s %s :%s", + Client_ID(target), Req->argv[1], Req->argv[2]); + return CONNECTED; +} diff --git a/src/ngircd/irc-metadata.h b/src/ngircd/irc-metadata.h new file mode 100644 index 0000000..3a2f0bb --- /dev/null +++ b/src/ngircd/irc-metadata.h @@ -0,0 +1,24 @@ +/* + * ngIRCd -- The Next Generation IRC Daemon + * Copyright (c)2001-2012 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. + */ + +#ifndef __irc_metadata_h__ +#define __irc_metadata_h__ + +/** + * @file + * IRC metadata commands (header) + */ + +GLOBAL bool IRC_METADATA PARAMS((CLIENT *Client, REQUEST *Req)); + +#endif + +/* -eof- */ diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 446180b..5ff9fcc 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -41,6 +41,7 @@ #include "irc-encoding.h" #include "irc-info.h" #include "irc-login.h" +#include "irc-metadata.h" #include "irc-mode.h" #include "irc-op.h" #include "irc-oper.h" @@ -78,6 +79,7 @@ static COMMAND My_Commands[] = { "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "METADATA", IRC_METADATA, CLIENT_SERVER, 0, 0, 0 }, { "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },

1 0

Alexander Barton : Don't cloak already cloaked hostname when using METADATA
by alex＠arthur.barton.de 07 Nov '12

07 Nov '12

Module: ngircd.git Branch: master Commit: 44b7ff02fd34731c6ed0d552dbde5c9981d53127 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=44b7ff02… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 5 23:46:26 2012 +0100 Don't cloak already cloaked hostname when using METADATA A client for which a METADATA command has been received from one of its peers got the client flag "M" set. So it's safe to assume that such a client gets "METADATA host" commands for its cloaked hostname and the server must not cloak the hostname on its own, even when the client mode "+x" is set. --- src/ngircd/client.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 92262b5..2f8d771 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -702,9 +702,16 @@ Client_HostnameCloaked(CLIENT *Client) assert(Client != NULL); + /* Client isn't cloaked at all, return real hostname: */ if (!Client_HasMode(Client, 'x')) return Client_Hostname(Client); + /* Client has received METADATA command, so it got the eventually + * cloaked hostname set correctly and this server doesn't need + * to cloak it on its own: */ + if (strchr(Client_Flags(Client), 'M')) + return Client_Hostname(Client); + /* Do simple mapping to the server ID? */ if (!*Conf_CloakHostModeX) return Client_ID(Client->introducer);

1 0

Alexander Barton : Generate "METADATA host" commands on "MODE +/-x"
by alex＠arthur.barton.de 07 Nov '12

07 Nov '12

Module: ngircd.git Branch: master Commit: 40e3daf560799df1d16629b35078979583cb4349 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=40e3daf5… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 5 23:49:12 2012 +0100 Generate "METADATA host" commands on "MODE +/-x" Use "METADATA host" commands to let servers supporting this command know which (possibly cloaked) hostname is in effect for a specific client. This prevents "double cloaking" of hostnames and even cloaked hostnames are in sync on all servers supporting "METADATA" now. --- src/ngircd/irc-mode.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index ce4044d..1cf19af 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -36,6 +36,8 @@ #include "irc-mode.h" +static void Announce_Client_Hostname PARAMS((CLIENT *Origin, CLIENT *Client)); + static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target)); static bool Channel_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, @@ -367,9 +369,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) Client_ID(Target), the_modes); if (send_RPL_HOSTHIDDEN_MSG) - IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG, - Client_ID(Client), - Client_HostnameCloaked(Client)); + Announce_Client_Hostname(Origin, Client); } LogDebug("%s \"%s\": Mode change, now \"%s\".", Client_TypeText(Target), Client_Mask(Target), @@ -381,6 +381,27 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) } /* Client_Mode */ +/** + * Announce changed client hostname in the network. + * + * @param Client The client of which the hostname changed. + */ +static void +Announce_Client_Hostname(CLIENT *Origin, CLIENT *Client) +{ + assert(Client != NULL); + + /* Inform the client itself */ + IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG, Client_ID(Client), + Client_HostnameCloaked(Client)); + + /* Inform other servers in the network */ + IRC_WriteStrServersPrefixFlag(Origin, Client_ThisServer(), 'M', + "METADATA %s host :%s", Client_ID(Client), + Client_HostnameCloaked(Client)); +} + + static bool Channel_Mode_Answer_Request(CLIENT *Origin, CHANNEL *Channel) {

1 0

Alexander Barton : doc/Protocol.txt: Document METADATA command
by alex＠arthur.barton.de 07 Nov '12

07 Nov '12

Module: ngircd.git Branch: master Commit: 7871a904d766e325bd2ce94dd8bea37f45198771 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7871a904… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 5 23:51:52 2012 +0100 doc/Protocol.txt: Document METADATA command --- doc/Protocol.txt | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/Protocol.txt b/doc/Protocol.txt index d0f0780..516a4a4 100644 --- a/doc/Protocol.txt +++ b/doc/Protocol.txt @@ -81,6 +81,9 @@ The following <serverflags> are defined at the moment: - H: The server supports the "enhanced server handshake", see section II.2 for a detailed description. +- M: Changing client "metadata" (hostname, real name, ...) using the + METADATA command is supported. + - o: IRC operators are allowed to change channel- and channel-user-modes even if they aren't channel-operator of the affected channel. @@ -194,13 +197,35 @@ received from the client using the set <client-charset> to the server encoding (UTF-8), and all message data which is to be sent to the client from the server encoding (UTF-8) to <client-charset>. -The list of supported <client-charset>'s is implementation dependent. +The list of supported client character sets is implementation dependent. If a client sets its <client-charset> to the server encoding (UTF-8), it disables all conversions; the connection behaves as if no CHARCONV command has been sent at all in this session. +II.6 Update client "metadata" + + Command: METADATA + Parameters: <target> <key> <value> + Used by: servers only + +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. + +The server updates its client database according to the received <key> and +<value> parameters, and passes the METADATA command on to all the other +servers in the network that support this command (see section II.1 "Register +new server link", <serverflag> "M"), even if it doesn't support the given +<key> itself: unknown <key> names are ignored silently! + +The following <key> names are defined: + + - "host": the hostname of a client (can't be empty) + - "info": info text ("real name") of a client + - "user": the user name of a client (can't be empty) + + III. Numerics used by IRC+ Protocol ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

Alexander Barton : Correctly add irc-metadata.{c|h} to Makefile.ng ...
by alex＠arthur.barton.de 07 Nov '12

07 Nov '12

Module: ngircd.git Branch: master Commit: f0b86e6c2685be460d06961e92ce840c35f93a19 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f0b86e6c… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 5 23:57:14 2012 +0100 Correctly add irc-metadata.{c|h} to Makefile.ng ... --- src/ngircd/Makefile.ng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ngircd/Makefile.ng b/src/ngircd/Makefile.ng index 27b5c40..cdbd27c 100644 --- a/src/ngircd/Makefile.ng +++ b/src/ngircd/Makefile.ng @@ -41,6 +41,7 @@ ngircd_SOURCES = \ irc-encoding.c \ irc-info.c \ irc-login.c \ + irc-metadata.c \ irc-mode.c \ irc-op.c \ irc-oper.c \ @@ -85,6 +86,7 @@ noinst_HEADERS = \ irc-encoding.h \ irc-info.h \ irc-login.h \ + irc-metadata.h \ irc-mode.h \ irc-op.h \ irc-oper.h \

1 0

Alexander Barton : doc/Protocol.txt: add/fix CHARCONV description
by alex＠arthur.barton.de 05 Nov '12

05 Nov '12

Module: ngircd.git Branch: master Commit: 79731a57f3f35744236407f128cdd09c32b700fa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=79731a57… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 5 23:11:41 2012 +0100 doc/Protocol.txt: add/fix CHARCONV description --- doc/Protocol.txt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/Protocol.txt b/doc/Protocol.txt index c7fd782..d0f0780 100644 --- a/doc/Protocol.txt +++ b/doc/Protocol.txt @@ -186,7 +186,19 @@ II.5 Client character encoding conversion Command: CHARCONV Parameters: <client-charset> Used by: registered clients - Replies: RPL_IP_CHARCONV_MSG, ERR_IP_CHARCONV_MSG + Replies: RPL_IP_CHARCONV, ERR_IP_CHARCONV + +A client can set its character set encoding using the CHARCONV command: +after receiving such a command, the server translates all message data +received from the client using the set <client-charset> to the server +encoding (UTF-8), and all message data which is to be sent to the client +from the server encoding (UTF-8) to <client-charset>. + +The list of supported <client-charset>'s is implementation dependent. + +If a client sets its <client-charset> to the server encoding (UTF-8), +it disables all conversions; the connection behaves as if no CHARCONV +command has been sent at all in this session. III. Numerics used by IRC+ Protocol @@ -201,7 +213,7 @@ Numerics 800-849 are used for status and success messages, and numerics III.1 IRC+ status and success numerics -800 - RPL_IP_CHARCONV_MSG +801 - RPL_IP_CHARCONV %1 :Client encoding set" %1 client character set @@ -209,5 +221,5 @@ III.1 IRC+ status and success numerics III.2 IRC+ failure and error numerics -850 - ERR_IP_CHARCONV_MSG +851 - ERR_IP_CHARCONV :Can't initialize client encoding

1 0

DNS777 : PredefChannelsOnly: Fix message for non pre-defined channels
by alex＠arthur.barton.de 04 Nov '12

04 Nov '12

Module: ngircd.git Branch: master Commit: a7f37cebdc300b3b87bb8d6b558769cf11441f61 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a7f37ceb… Author: DNS777 <dns(a)rbose.org> Date: Tue Oct 16 07:28:44 2012 +0200 PredefChannelsOnly: Fix message for non pre-defined channels If PredefChannelsOnly is enabled, and if someone tries to create a channel which does not exist, then the error message is a 474. The 474 Error message changed recently and does not match anymore: 'Cannot join channel (+b) -- You are banned'. Changed the error message to numeric 403 'No such channel'. Bug introduced by commit 9a82304a. (cherry picked from commit 2c2e08f34187a33c1da745995c5f213e33a91410) --- src/ngircd/irc-channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index ed4839a..41947a8 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -365,7 +365,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) chan = Channel_Search(channame); if (!chan && Conf_PredefChannelsOnly) { /* channel must be created, but forbidden by config */ - IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, + IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG, Client_ID(Client), channame); goto join_next; }

1 0

Alexander Barton : Test suite: add some "remote checks" to whois-test.e
by alex＠arthur.barton.de 04 Nov '12

04 Nov '12

Module: ngircd.git Branch: master Commit: 47b99c69cc411ec35078917ab6d9d7278ed2a1da URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=47b99c69… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 4 19:50:02 2012 +0100 Test suite: add some "remote checks" to whois-test.e --- src/testsuite/whois-test.e | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e index 3c393e8..fdb21bc 100644 --- a/src/testsuite/whois-test.e +++ b/src/testsuite/whois-test.e @@ -58,6 +58,18 @@ expect { "318 nick unknown :" } +send "whois ngircd.test.server2 nick\r" +expect { + timeout { exit 1 } + ":ngircd.test.server2 311 nick nick ~user localhost* \* :Real Name\r" +} + +send "whois nosuchserver unknown\r" +expect { + timeout { exit 1 } + "402 nick nosuchserver :" +} + send "quit\r" expect { timeout { exit 1 }

1 0

Alexander Barton : Send NICK commands with prefix of (target) user
by alex＠arthur.barton.de 04 Nov '12

04 Nov '12

Module: ngircd.git Branch: master Commit: 757f3497bc594a5a950806279349d361be7a1515 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=757f3497… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 4 18:01:49 2012 +0100 Send NICK commands with prefix of (target) user Now NICK commands are always generated using the prefix of the target user, even when the nickname change has been initiated by some other (pseudo) server or using the SVSNICK command. In this case, the prefix of the initiator has been used, but this isn't compatible with clients (at least weechat and irssi don't handle such NICK commands correctly). --- src/ngircd/irc-login.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 977fc54..5ec6162 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -971,7 +971,7 @@ Change_Nick(CLIENT *Origin, CLIENT *Target, char *NewNick, bool InformClient) /* Inform all servers and users (which have to know) of the new name */ if (InformClient) { - IRC_WriteStrClientPrefix(Target, Origin, "NICK :%s", NewNick); + IRC_WriteStrClientPrefix(Target, Target, "NICK :%s", NewNick); IRC_WriteStrServersPrefix(NULL, Target, "NICK :%s", NewNick); } else IRC_WriteStrServersPrefix(Origin, Target, "NICK :%s", NewNick);

1 0

Alexander Barton : Update doc/Services.txt, sort services alphabetically
by alex＠arthur.barton.de 04 Nov '12

04 Nov '12

Module: ngircd.git Branch: master Commit: f2455cbe33aed1bbbef9dc31363cbf46ee87a4a3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f2455cbe… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 4 13:22:26 2012 +0100 Update doc/Services.txt, sort services alphabetically --- doc/Services.txt | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/doc/Services.txt b/doc/Services.txt index 944afd4..26d1d7e 100644 --- a/doc/Services.txt +++ b/doc/Services.txt @@ -13,13 +13,16 @@ At the moment, ngIRCd doesn't implement a "special IRC services interface". 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/>), Anope 1.9 using a -preliminary protocol module for ngIRCd (<http://www.anope.org/>), and -Atheme 7.0.2 or later. +Support for Services has been tested using + - Anope 1.9.4 or later (<http://www.anope.org/>) + - Atheme 7.0.2 or later (<http://www.atheme.net>) + - "IRC Services" 5.1.x by Andrew Church (<http://achurch.org/services/>) This document describes setting up ngIRCd and these services. +Please let us know if you are successfully using other IRC service packages or +which problems you encounter -- thanks! + Setting up ngIRCd ~~~~~~~~~~~~~~~~~ @@ -63,6 +66,25 @@ settings marked as required: } +Setting up Atheme 7.0.2 or later +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Atheme 7.0.2 or later (<http://www.atheme.net>) 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. + + Setting up IRC Services 5.1.x ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -92,26 +114,3 @@ In modules.conf: 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