ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Alexander Barton : tool.h: Don't check for and #define PF_INET
by alex＠arthur.barton.de 11 Nov '12

11 Nov '12

Module: ngircd.git Branch: master Commit: e29d198700a9e1c026d7f4b2601d127045adbe53 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e29d1987… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 11 11:05:21 2012 +0100 tool.h: Don't check for and #define PF_INET This is correctly handled by ipaddr/ng_ipaddr.h today, and the check in tool.h isn't required any more -- and caused errors on OpenBSD 5.0: In file included from ./../tool/tool.h:23: /usr/include/arpa/inet.h:74: warning: "struct in_addr" declared inside parameter list --- src/tool/tool.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/tool/tool.h b/src/tool/tool.h index 9fa19e5..b05649a 100644 --- a/src/tool/tool.h +++ b/src/tool/tool.h @@ -19,12 +19,6 @@ #include "portab.h" -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#else -# define PF_INET AF_INET -#endif - GLOBAL void ngt_TrimLastChr PARAMS((char *String, const char Chr )); GLOBAL void ngt_TrimStr PARAMS((char *String ));

1 0

Alexander Barton : conf-ssl.h: Use "gnutls_session_t" instead of " gnutls_session"
by alex＠arthur.barton.de 11 Nov '12

11 Nov '12

Module: ngircd.git Branch: master Commit: 6f531a3c99ca267370b8f77cd3e51d751fb48826 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6f531a3c… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 11 10:49:06 2012 +0100 conf-ssl.h: Use "gnutls_session_t" instead of "gnutls_session" This fixes the following warning with current versions of GnuTLS: conf-ssl.h:36: warning: "gnutls_session" is deprecated --- src/ngircd/conf-ssl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/conf-ssl.h b/src/ngircd/conf-ssl.h index 428bcf4..22897ef 100644 --- a/src/ngircd/conf-ssl.h +++ b/src/ngircd/conf-ssl.h @@ -33,7 +33,7 @@ struct ConnSSL_State { SSL *ssl; #endif #ifdef HAVE_LIBGNUTLS - gnutls_session gnutls_session; + gnutls_session_t gnutls_session; void *cookie; /* pointer to server configuration structure (for outgoing connections), or NULL. */ #endif

1 0

Alexander Barton : doc/Services.txt: Update documentation for Anope 1.9.8
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: c7db2f8429c161835f6a9ed4523f45c23918892b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c7db2f84… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 10 21:24:55 2012 +0100 doc/Services.txt: Update documentation for Anope 1.9.8 Starting with Anope 1.9.8, the ngIRCd protocol module is rewritten from scratch by "DukePyrolator" and included in the Anope distribution. So no patching is required any more, yeah! Drawback: Anope 1.9.8 is in development and not yet released ... --- doc/Services.txt | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/doc/Services.txt b/doc/Services.txt index 26d1d7e..f51bd48 100644 --- a/doc/Services.txt +++ b/doc/Services.txt @@ -9,12 +9,12 @@ -- Services.txt -- -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. +ngIRCd doesn't implement a "special IRC services interface", but services +acting as a "regular servers" ("pseudo servers") are supported, either +using the IRC protocol as defined in RFC 1459 or RFC 2812. Support for Services has been tested using - - Anope 1.9.4 or later (<http://www.anope.org/>) + - Anope 1.9.8 or later (<http://www.anope.org/>; unreleased!) - Atheme 7.0.2 or later (<http://www.atheme.net>) - "IRC Services" 5.1.x by Andrew Church (<http://achurch.org/services/>) @@ -44,13 +44,21 @@ Example: Setting up Anope 1.9.x ~~~~~~~~~~~~~~~~~~~~~~ -Anope 1.9.4 (and above) can be used with ngIRCd using a preliminary "ngircd" -protocol module contained in our contrib/Anope/ directory. Please see the -file contrib/Anope/README for installation instructions! +Anope 1.9.8 or later (<http://www.anope.org/>; unreleased as of 2012-11-10) +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/>! -After patching and installing Anope, at least the following configuration -variables have to be adjusted in data/services.conf, in addition to all the -settings marked as required: +At least the following settings have to be tweaked, in addition to all the +settings marked as required by Anope: + +In conf/services.conf: + + define + { + name = "services.host" + value = "services.irc.net" + } uplink { @@ -59,10 +67,24 @@ settings marked as required: password = "123abc" } - serverinfo + # Load ngIRCd protocol module + module { name = "ngircd" } + + networkinfo + { + # Must be set to the "MaxNickLength" setting of ngIRCd! + nicklen = 9 + + chanlen = 50 + } + +In conf/nickserv.conf: + + nickserv { - name = "services.irc.net" - type = "ngircd" + # not required if you are running ngIRCd with a higher nickname limit + # ("MaxNickLength") than 11 characters, but REQUIRED by default! + guestnickprefix = "G-" }

1 0

Alexander Barton : Remove Anope "ngircd" protocol module patches
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: 45b0bb5aff6157409ea88b344c34b7bf84dc8886 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=45b0bb5a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 4 13:58:25 2012 +0100 Remove Anope "ngircd" protocol module patches Starting with Anope 1.9.8, the ngIRCd protocol module is included in the Anope distribution, so there's no longer any need to support our own (but now heavily outdated!) patches. Therefore remove them. --- configure.ng | 1 - contrib/Anope/0001-Revert-Removed-ngircd.patch | 496 -------------------- contrib/Anope/0002-ngircd-whitespace-fixes.patch | 60 --- ...-ngIRCd-protocol-module-for-current-Anope.patch | 128 ----- ...ircd-Do-PING-PONG-on-server-burst-to-sync.patch | 93 ---- ...ircd-always-prefix-modes-in-CHANINFO-with.patch | 29 -- ...cd-support-user-mode-R-and-channel-mode-R.patch | 47 -- ...0007-ngircd-Fix-handling-of-JOIN-commands.patch | 96 ---- ...d-Allow-setting-modes-by-clients-on-burst.patch | 38 -- ...-Update-protocol-module-for-current-Anope.patch | 143 ------ contrib/Anope/0010-ngircd-Add-ProtongIRCd.patch | 57 --- ...-Update-protocol-module-for-current-Anope.patch | 29 -- ...12-ngircd-Channel-mode-r-is-supported-now.patch | 25 - .../0013-ngircd-Update-copyright-notice.patch | 28 -- ...gircd-set-unset-GLINE-s-on-AKILL-commands.patch | 35 -- ...ngircd-ngIRCd-supports-channel-mode-e-now.patch | 27 -- .../Anope/0016-ngircd-support-SQUERY-command.patch | 35 -- contrib/Anope/Makefile.am | 34 -- contrib/Anope/README | 35 -- contrib/Makefile.am | 4 +- contrib/README | 3 - 21 files changed, 2 insertions(+), 1441 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=45b0…

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: 4185c4a44aeb69ee6b970809a1f604e600ee88eb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4185c4a4… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 10 21:49:02 2012 +0100 Update NEWS and ChangeLog files --- ChangeLog | 27 +++++++++++++++++++++++++++ NEWS | 17 +++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index 296c23f..7146ae1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,33 @@ ngIRCd + - Update doc/Services.txt: describe the upcoming version of Anope 1.9.8, + then including a protocol module for ngIRCd. And remove our own patches + in ./contrib/Anope because they aren't supported any more ... + - Implement new "METADATA" command which can be used by remote servers + and IRC services to update client metadata like the client info text + ("real name"), user name, and hostname, and use this command to + configure an cloaked hostname (user mode "+x") on remote servers: + This prevents "double cloaking" of hostnames and even cloaked + hostnames are in sync on all servers supporting "METADATA" now. + - Fix error message when trying to join non-predefined channels and the + "PredefChannelsOnly" configuration option is set. + - Implement new IRC "SVSNICK" command to allow remote servers (and IRC + services) to change nicknames of already registered users. 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 run mixed 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 desynchronization of the network. + - Make server reconnect time a little bit more random, so that two + servers trying to connect to each other asynchronously don't try this + in exactly the same time periods and kick each other off ... + - Don't accept connections for servers already being linked: there was a + time frame that could result in one connection overwriting the other, + e. g. the incoming connection overwriting the status of the outgoing + one. And this could lead to all kind of weirdness (even crashes!) later + on: now such incoming connections are dropped. - New configuration option "MaxListSize" to configure the maximum number of channels returned by a LIST command. The default is 100, as before. - Implement user mode "b", "block messages": when a user has set mode "b", diff --git a/NEWS b/NEWS index b6a5efd..8997a02 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,23 @@ ngIRCd + - Update doc/Services.txt: describe the upcoming version of Anope 1.9.8, + then including a protocol module for ngIRCd. And remove our own patches + in ./contrib/Anope because they aren't supported any more ... + - Implement new "METADATA" command which can be used by remote servers + and IRC services to update client metadata like the client info text + ("real name"), user name, and hostname, and use this command to + configure an cloaked hostname (user mode "+x") on remote servers: + This prevents "double cloaking" of hostnames and even cloaked + hostnames are in sync on all servers supporting "METADATA" now. + - Implement new IRC "SVSNICK" command to allow remote servers (and IRC + services) to change nicknames of already registered users. 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 run mixed 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 desynchronization of the network. - New configuration option "MaxListSize" to configure the maximum number of channels returned by a LIST command. The default is 100, as before. - Implement user mode "b", "block messages": when a user has set mode "b",

1 0

Alexander Barton : Update autoconf/automake version numbers in doc/ HowToRelease.txt
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: 646218e6f4d936b7448b2b407ffb6a53650658de URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=646218e6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 10 21:50:36 2012 +0100 Update autoconf/automake version numbers in doc/HowToRelease.txt --- doc/HowToRelease.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HowToRelease.txt b/doc/HowToRelease.txt index d4d82bc..429c3d8 100644 --- a/doc/HowToRelease.txt +++ b/doc/HowToRelease.txt @@ -40,7 +40,7 @@ a) Make sure the source tree is in a releasable state ;-) b) Make sure you have working versions of GNU autoconf and GNU automake installed on the system you use for generating the release: - as of October 2010 we are using GNU autoconf 2.61 and GNU automake 1.10.1 + as of October 2010 we are using GNU autoconf 2.67 and GNU automake 1.11.1 which seem to work just fine. c) Update the files describing the new release:

1 0

Alexander Barton : Add new IRC+ server flag "X": "XOP modes supported"
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: 53917fa4b80753fc189ed5a516c06c804f2cf415 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=53917fa4… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 10 23:33:19 2012 +0100 Add new IRC+ server flag "X": "XOP modes supported" This flag indicates, that the server supports the enhanced "xop channel user modes", like channel owner, admin, and halfop. This information is used to make sure that no unsupported CHANINFO commands are sent to servers not supporting such mode prefixes, for example. --- doc/Protocol.txt | 3 +++ src/ngircd/defines.h | 2 +- src/ngircd/numeric.c | 17 +++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/Protocol.txt b/doc/Protocol.txt index 516a4a4..9a8ddf6 100644 --- a/doc/Protocol.txt +++ b/doc/Protocol.txt @@ -89,6 +89,9 @@ The following <serverflags> are defined at the moment: - S: The server supports the SERVICE command (on this link). +- X: Server supports XOP channel modes (owner, admin, halfop) and supports + these user prefixes in CHANINFO commands, for example. + - Z: Compressed server links are supported by the server. Example for a complete <flags> string: "ngircd|0.7.5:CZ". diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index b2de98d..dcdd440 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -157,7 +157,7 @@ #ifdef IRCPLUS /** Standard IRC+ flags. */ -# define IRCPLUSFLAGS "CHLMS" +# define IRCPLUSFLAGS "CHLMSX" #endif /** Supported user modes. */ diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index 3fc8c46..f48cc21 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -48,12 +48,11 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan) CL2CHAN *cl2chan; CLIENT *cl; char str[LINE_LEN], *ptr; - bool njoin; + bool njoin, xop; - if (Conn_Options(Client_Conn(Client)) & CONN_RFC1459) - njoin = false; - else - njoin = true; + /* Check features of remote server */ + njoin = Conn_Options(Client_Conn(Client)) & CONN_RFC1459 ? false : true; + xop = strchr(Client_Flags(Client), 'X') ? true : false; /* Get all the members of this channel */ cl2chan = Channel_FirstMember(Chan); @@ -67,13 +66,15 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan) * (if user is channel operator or has voice) */ if (str[strlen(str) - 1] != ':') strlcat(str, ",", sizeof(str)); - if (strchr(Channel_UserModes(Chan, cl), 'q')) + + /* Prepare user prefix (ChanOp, voiced, ...) */ + if (xop && strchr(Channel_UserModes(Chan, cl), 'q')) strlcat(str, "~", sizeof(str)); - if (strchr(Channel_UserModes(Chan, cl), 'a')) + if (xop && strchr(Channel_UserModes(Chan, cl), 'a')) strlcat(str, "&", sizeof(str)); if (strchr(Channel_UserModes(Chan, cl), 'o')) strlcat(str, "@", sizeof(str)); - if (strchr(Channel_UserModes(Chan, cl), 'h')) + if (xop && strchr(Channel_UserModes(Chan, cl), 'h')) strlcat(str, "%", sizeof(str)); if (strchr(Channel_UserModes(Chan, cl), 'v')) strlcat(str, "+", sizeof(str));

1 0

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

Springe zur Seite:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates