- ngIRCd GIT Updates - lists.barton.de

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

Alexander Barton : IRC_NICK(): Code cleanup, new function Change_Nick()
by alex＠arthur.barton.de 02 Nov '12

02 Nov '12

Module: ngircd.git Branch: master Commit: 497edbaf3eb51e6c67975713ee5c52d2d1b48105 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=497edbaf… Author: Alexander Barton <alex(a)barton.de> Date: Fri Nov 2 14:36:29 2012 +0100 IRC_NICK(): Code cleanup, new function Change_Nick() --- src/ngircd/irc-login.c | 80 +++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 35 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 7d6e07d..c3f32b7 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -38,7 +38,10 @@ #include "exp.h" #include "irc-login.h" -static void Kill_Nick PARAMS(( char *Nick, char *Reason )); +static void Kill_Nick PARAMS((char *Nick, char *Reason)); +static void Change_Nick PARAMS((CLIENT * Origin, CLIENT * Target, + char *NewNick, bool RegisterWhowas)); + /** * Handler for the IRC "PASS" command. @@ -275,40 +278,8 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) Client_SetType( Client, CLIENT_GOTNICK ); } else { /* Nickname change */ - if (Client_Conn(target) > NONE) { - /* Local client */ - Log(LOG_INFO, - "%s \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", - Client_TypeText(target), Client_Mask(target), - Client_Conn(target), Client_ID(target), - Req->argv[0]); - Conn_UpdateIdle(Client_Conn(target)); - } else { - /* Remote client */ - LogDebug("%s \"%s\" changed nick: \"%s\" -> \"%s\".", - Client_TypeText(target), - Client_Mask(target), Client_ID(target), - Req->argv[0]); - } - - /* Inform all users and servers (which have to know) - * of this nickname change */ - if( Client_Type( Client ) == CLIENT_USER ) - IRC_WriteStrClientPrefix( Client, Client, - "NICK :%s", - Req->argv[0] ); - IRC_WriteStrServersPrefix( Client, target, - "NICK :%s", Req->argv[0] ); - IRC_WriteStrRelatedPrefix( target, target, false, - "NICK :%s", Req->argv[0] ); - - /* Register old nickname for WHOWAS queries */ - Client_RegisterWhowas( target ); - - /* Save new nickname */ - Client_SetID( target, Req->argv[0] ); - - IRC_SetPenalty( target, 2 ); + Change_Nick(Client, target, Req->argv[0], true); + IRC_SetPenalty(target, 2); } return CONNECTED; @@ -925,4 +896,43 @@ Kill_Nick(char *Nick, char *Reason) } /* Kill_Nick */ +/** + * Change the nickname of a client. + * + * @param Origin The client which caused the nickname change. + * @param Target The client of which the nickname should be changed. + * @param NewNick The new nickname. + */ +static void +Change_Nick(CLIENT *Origin, CLIENT *Target, char *NewNick, bool RegisterWhowas) +{ + if (Client_Conn(Target) > NONE) { + /* Local client */ + Log(LOG_INFO, + "%s \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", + Client_TypeText(Target), Client_Mask(Target), + Client_Conn(Target), Client_ID(Target), NewNick); + Conn_UpdateIdle(Client_Conn(Target)); + } else { + /* Remote client */ + LogDebug("%s \"%s\" changed nick: \"%s\" -> \"%s\".", + Client_TypeText(Target), + Client_Mask(Target), Client_ID(Target), NewNick); + } + + /* Inform all servers and users (which have to know) of the new name */ + if (Client_Type(Origin) == CLIENT_USER) + IRC_WriteStrClientPrefix(Origin, Origin, "NICK :%s", NewNick); + IRC_WriteStrServersPrefix(Origin, Target, "NICK :%s", NewNick); + IRC_WriteStrRelatedPrefix(Target, Target, false, "NICK :%s", NewNick); + + /* Register old nickname for WHOWAS queries, if required */ + if (RegisterWhowas) + Client_RegisterWhowas(Target); + + /* Save new nickname */ + Client_SetID(Target, NewNick); +} + + /* -eof- */

1 0

Alexander Barton : Implement SVSNICK command to change remote nicknames
by alex＠arthur.barton.de 02 Nov '12

02 Nov '12

Module: ngircd.git Branch: master Commit: e3f300d3231f56efe2831fb79f7b484d96d051f5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e3f300d3… Author: Alexander Barton <alex(a)barton.de> Date: Fri Nov 2 17:50:31 2012 +0100 Implement SVSNICK command to change remote nicknames The SVSNICK command allows other servers (and services on "pseudo-servers") to forcefully change nicknames of remote users. Syntax: ":<from> SVSNICK <oldnick> <newnick>" The SVSNICK command itself doesn't change the nickname, but it becomes forwarded to the server to which the user is connected to. And then this server initiates the real nickname changing using regular NICK commands. This allows to still run networks with old servers not supporting the SVSNICK command, because SVSNICK commands for nicknames on such servers are silently ignored and don't cause a desync of the network. --- src/ngircd/irc-login.c | 72 ++++++++++++++++++++++++++++++++++++++++-------- src/ngircd/irc-login.h | 3 +- src/ngircd/parse.c | 1 + 3 files changed, 64 insertions(+), 12 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index c3f32b7..977fc54 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * 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 @@ -39,8 +39,8 @@ #include "irc-login.h" static void Kill_Nick PARAMS((char *Nick, char *Reason)); -static void Change_Nick PARAMS((CLIENT * Origin, CLIENT * Target, - char *NewNick, bool RegisterWhowas)); +static void Change_Nick PARAMS((CLIENT * Origin, CLIENT * Target, char *NewNick, + bool InformClient)); /** @@ -278,7 +278,8 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) Client_SetType( Client, CLIENT_GOTNICK ); } else { /* Nickname change */ - Change_Nick(Client, target, Req->argv[0], true); + Change_Nick(Client, target, Req->argv[0], + Client_Type(Client) == CLIENT_USER ? true : false); IRC_SetPenalty(target, 2); } @@ -360,6 +361,54 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) /** + * Handler for the IRC "SVSNICK" command. + * + * @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_SVSNICK(CLIENT *Client, REQUEST *Req) +{ + CLIENT *from, *target; + + assert(Client != NULL); + assert(Req != NULL); + + if (Req->argc != 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + /* Search the originator */ + from = Client_Search(Req->prefix); + if (!from) + from = Client; + + /* Search the target */ + target = Client_Search(Req->argv[0]); + if (!target || Client_Type(target) != CLIENT_USER) { + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->argv[0]); + } + + if (Client_Conn(target) <= NONE) { + /* We have to forward the message to the server handling + * this user; this is required to make sure all servers + * in the network do follow the nick name change! */ + return IRC_WriteStrClientPrefix(Client_NextHop(target), from, + "SVSNICK %s %s", + Req->argv[0], Req->argv[1]); + } + + /* Make sure that the new nickname is valid */ + if (!Client_CheckNick(from, Req->argv[1])) + return CONNECTED; + + Change_Nick(from, target, Req->argv[1], true); + return CONNECTED; +} + +/** * Handler for the IRC "USER" command. * * See RFC 2812, 3.1.3 "User message". @@ -904,7 +953,7 @@ Kill_Nick(char *Nick, char *Reason) * @param NewNick The new nickname. */ static void -Change_Nick(CLIENT *Origin, CLIENT *Target, char *NewNick, bool RegisterWhowas) +Change_Nick(CLIENT *Origin, CLIENT *Target, char *NewNick, bool InformClient) { if (Client_Conn(Target) > NONE) { /* Local client */ @@ -921,14 +970,15 @@ Change_Nick(CLIENT *Origin, CLIENT *Target, char *NewNick, bool RegisterWhowas) } /* Inform all servers and users (which have to know) of the new name */ - if (Client_Type(Origin) == CLIENT_USER) - IRC_WriteStrClientPrefix(Origin, Origin, "NICK :%s", NewNick); - IRC_WriteStrServersPrefix(Origin, Target, "NICK :%s", NewNick); + if (InformClient) { + IRC_WriteStrClientPrefix(Target, Origin, "NICK :%s", NewNick); + IRC_WriteStrServersPrefix(NULL, Target, "NICK :%s", NewNick); + } else + IRC_WriteStrServersPrefix(Origin, Target, "NICK :%s", NewNick); IRC_WriteStrRelatedPrefix(Target, Target, false, "NICK :%s", NewNick); - /* Register old nickname for WHOWAS queries, if required */ - if (RegisterWhowas) - Client_RegisterWhowas(Target); + /* Register old nickname for WHOWAS queries */ + Client_RegisterWhowas(Target); /* Save new nickname */ Client_SetID(Target, NewNick); diff --git a/src/ngircd/irc-login.h b/src/ngircd/irc-login.h index f3138f6..15be7b4 100644 --- a/src/ngircd/irc-login.h +++ b/src/ngircd/irc-login.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * 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 @@ -26,6 +26,7 @@ GLOBAL bool IRC_PING PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_PONG PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_QUIT PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_QUIT_HTTP PARAMS((CLIENT *Client, REQUEST *Req)); +GLOBAL bool IRC_SVSNICK PARAMS(( CLIENT *Client, REQUEST *Req )); #endif diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index f3b04d0..446180b 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -99,6 +99,7 @@ static COMMAND My_Commands[] = { "SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "SVSNICK", IRC_SVSNICK, CLIENT_SERVER, 0, 0, 0 }, { "SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },

1 0