März 2011 - ngIRCd GIT Updates

Alexander Barton : Warn when unknown variables are found in [Features] section
by alex＠arthur.barton.de 25 Mär '11

25 Mär '11

Module: ngircd.git Branch: master Commit: f1a4a4dc882e28affb0f2f3b940e5762df230ccd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f1a4a4dc… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 25 12:12:20 2011 +0100 Warn when unknown variables are found in [Features] section --- src/ngircd/conf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index d27a2dd..32461f3 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1278,6 +1278,10 @@ Handle_FEATURES(int Line, char *Var, char *Arg) WarnPAM(Line); return; } + + Config_Error(LOG_ERR, + "%s, line %d (section \"Features\"): Unknown variable \"%s\"!", + NGIRCd_ConfFile, Line, Var); } static void

1 0

Alexander Barton : Update doc/GIT.txt
by alex＠arthur.barton.de 25 Mär '11

25 Mär '11

Module: ngircd.git Branch: master Commit: 6cb90f399d21f0bdbf3744423c923402f3419b99 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6cb90f39… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 25 11:14:04 2011 +0100 Update doc/GIT.txt --- doc/GIT.txt | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/GIT.txt b/doc/GIT.txt index c42696d..4375184 100644 --- a/doc/GIT.txt +++ b/doc/GIT.txt @@ -1,10 +1,18 @@ + ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ + + (c)2001-2011 Alexander Barton and Contributors. + ngIRCd is free software and published under the + terms of the GNU General Public License. -- GIT.txt -- + The source code of ngIRCd is maintained using git, the stupid content tracker. + I. Getting the source code ~~~~~~~~~~~~~~~~~~~~~~~~~~ To access the source tree anonymously, run: @@ -20,7 +28,8 @@ git commands will be executed from within this directory in the future. Please note: When checking out a fresh copy of ngIRCd using git, the configure script doesn't exist; you have to run the autogen.sh shell script (which is included in the source tree) to generate it. This requires you to -have GNU automake and GNU autoconf installed on your system. +have GNU automake and GNU autoconf installed on your system. Please see the +file INSTALL for details! To update the git tree: @@ -28,6 +37,7 @@ To update the git tree: This retrieves all changes and merges them into the current branch. + II. Contributing ~~~~~~~~~~~~~~~~ @@ -42,4 +52,3 @@ III. Write Access ~~~~~~~~~~~~~~~~~ If you want to contribute a couple of patches and write access to the git repository would be handy, please contact Alex Barton, <alex(a)barton.de>. -

1 0

Alexander Barton : Update INSTALL text
by alex＠arthur.barton.de 23 Mär '11

23 Mär '11

Module: ngircd.git Branch: master Commit: d587926eb091929faa4f57c8e79d181ce7946357 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d587926e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 23 01:08:49 2011 +0100 Update INSTALL text --- INSTALL | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/INSTALL b/INSTALL index 601ec2d..8547efc 100644 --- a/INSTALL +++ b/INSTALL @@ -73,7 +73,8 @@ location, /usr/local/sbin/. The next step is to configure and afterwards starting the daemon. Please have a look at the ngircd(8) and ngircd.conf(5) manual pages for details -and all possible options. +and all possible options -- and don't forget to run "ngircd --configtest" +to validate your configuration file! If no previous version of the configuration file exists (the standard name is /usr/local/etc/ngircd.conf), a sample configuration file containing all @@ -128,11 +129,12 @@ the local system. Normally, root privileges are necessary to complete this step. If there is already an older configuration file present, it won't be overwritten. -This files will be installed by default: +These files and folders will be installed by default: - /usr/local/sbin/ngircd: executable server - /usr/local/etc/ngircd.conf: sample configuration (if not already present) - /usr/local/share/doc/ngircd/: documentation +- /usr/local/share/man/: manual pages III. Additional features @@ -226,19 +228,20 @@ V. Sample configuration file ngircd.conf In the sample configuration file, there are comments beginning with "#" OR ";" -- this is only for the better understanding of the file. -The file is separated in four blocks: [Global], [Operator], [Server], and -[Channel]. +The file is separated in five blocks: [Global], [Features], [Operator], +[Server], and [Channel]. In the [Global] section, there is the main configuration like the server -name and the ports, on which the server should be listening. IRC operators -of this server are defined in [Operator] blocks. [Server] is the section -where server links are configured. And [Channel] blocks are used to -configure pre-defined ("persistent") IRC channels. +name and the ports, on which the server should be listening. Options in +the [Features] section enable or disable functionality in the daemon. +IRC operators of this server are defined in [Operator] blocks, remote +servers are configured in [Server] sections, and [Channel] blocks are +used to configure pre-defined ("persistent") IRC channels. The meaning of the variables in the configuration file is explained in the "doc/sample-ngircd.conf", which is used as sample configuration file in /usr/local/etc after running "make install" (if you don't already have one) -and in the "ngircd.conf" manual page. +and in the ngircd.conf(5) manual page. VI. Command line options @@ -263,3 +266,5 @@ These parameters could be passed to the ngIRCd: Use "--help" to see a short help text describing all available parameters the server understands, with "--version" the ngIRCd shows its version number. In both cases the server exits after the output. + +Please see the ngircd(8) manual page for complete details!

1 0

Alexander Barton : Generate WALLOPS message on SQUIT from IRC operator
by alex＠arthur.barton.de 22 Mär '11

22 Mär '11

Module: ngircd.git Branch: master Commit: 770a58ac6df8099cfa8e7cf3b105ef495f2cf437 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=770a58ac… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 21 23:51:53 2011 +0100 Generate WALLOPS message on SQUIT from IRC operator So SQUIT now behaves like CONNECT and DISCONNECT commands, when called by an IRC operator (and not received from an other server). --- src/ngircd/irc-server.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index b592eb9..cca295a 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -277,6 +277,7 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) char msg[COMMAND_LEN], logmsg[COMMAND_LEN]; CLIENT *from, *target; CONN_ID con; + int loglevel; assert(Client != NULL); assert(Req != NULL); @@ -301,7 +302,11 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); - Log(LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...", + if (Client_Type(Client) == CLIENT_USER) + loglevel = LOG_NOTICE | LOG_snotice; + else + loglevel = LOG_DEBUG; + Log(loglevel, "Got SQUIT from %s for \"%s\": \"%s\" ...", Client_ID(from), Req->argv[0], Req->argv[1]); target = Client_Search(Req->argv[0]);

1 0

Alexander Barton : Commands received from other servers must have prefixes
by alex＠arthur.barton.de 21 Mär '11

21 Mär '11

Module: ngircd.git Branch: master Commit: 15775e67900d914cc174aa80e615fa24d65d115c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=15775e67… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 21 10:46:09 2011 +0100 Commands received from other servers must have prefixes Make sure that all commands received from other servers do have valid prefixes. Only exceptions are PING and ERROR commands that can occure without prefixes when generated by the remote peer itself. --- src/ngircd/parse.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 8203dd0..31f048c 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -276,11 +276,24 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) *Closed = false; - if( ! Req->prefix ) return true; - client = Conn_GetClient( Idx ); assert( client != NULL ); + if (!Req->prefix && Client_Type(client) == CLIENT_SERVER + && strcasecmp(Req->command, "ERROR") != 0 + && strcasecmp(Req->command, "PING") != 0) + { + Log(LOG_ERR, + "Received command without prefix (connection %d, command \"%s\")!?", + Idx, Req->command); + if (!Conn_WriteStr(Idx, "ERROR :Prefix missing")) + *Closed = true; + return false; + } + + if (!Req->prefix) + return true; + /* only validate if this connection is already registered */ if (Client_Type(client) != CLIENT_USER && Client_Type(client) != CLIENT_SERVER

1 0

Alexander Barton : Allow servers to send more commands in the first 10 secods
by alex＠arthur.barton.de 21 Mär '11

21 Mär '11

Module: ngircd.git Branch: master Commit: 62f705f97e580fe61520793b3387081915f240ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=62f705f9… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 21 09:42:01 2011 +0100 Allow servers to send more commands in the first 10 secods This helps to speed up server login and network synchronisation. --- src/ngircd/conn.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 397bc91..63093c2 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1629,18 +1629,25 @@ Handle_Buffer(CONN_ID Idx) CLIENT *c; c = Conn_GetClient(Idx); - assert( c != NULL); + starttime = time(NULL); + + assert(c != NULL); /* Servers do get special command limits, so they can process * all the messages that are required while peering. */ switch (Client_Type(c)) { case CLIENT_SERVER: - maxcmd = MAX_COMMANDS_SERVER; break; + /* Allow servers to send more commands in the first 10 secods + * to speed up server login and network synchronisation. */ + if (starttime - Client_StartTime(c) < 10) + maxcmd = MAX_COMMANDS_SERVER * 5; + else + maxcmd = MAX_COMMANDS_SERVER; + break; case CLIENT_SERVICE: maxcmd = MAX_COMMANDS_SERVICE; break; } - starttime = time(NULL); for (i=0; i < maxcmd; i++) { /* Check penalty */ if (My_Connections[Idx].delaytime > starttime)

1 0

Alexander Barton : IRC_CHANINFO(): Code cleanup
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: a39e2f22c928a8bd8d16c2e008a62800f6412fe6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a39e2f22… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:29:19 2011 +0100 IRC_CHANINFO(): Code cleanup --- src/ngircd/irc-channel.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 33ea68d..476c313 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -688,7 +688,9 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) assert( Req != NULL ); /* Bad number of parameters? */ - if(( Req->argc < 2 ) || ( Req->argc == 4 ) || ( Req->argc > 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); /* Compatibility kludge */ if( Req->argc == 5 ) arg_topic = 4;

1 0

Alexander Barton : Handle_GLOBAL(): don't use multi-line strings
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: dcb1951efdc21fc175817bca67aed01bee9749b4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dcb1951e… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:28:38 2011 +0100 Handle_GLOBAL(): don't use multi-line strings They aren't supported by elder C compilers ... --- src/ngircd/conf.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index fb8db2c..d27a2dd 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1128,8 +1128,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) } if (CheckLegacyNoOption(Var, Arg)) { - Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use " - "\"%s = %s\" in [FEATURES] section instead", + Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use \"%s = %s\" in [FEATURES] section instead", NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); if (strcasecmp(Var, "NoIdent") == 0) WarnIdent(Line);

1 0

Alexander Barton : Merge branches 'CloakUserHost', 'QuitOnHTTP' and ' bug72-WHOIS-List'
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: fa8b83e69b0d7edcfdcf8f0a4496c79f9c5ec161 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fa8b83e6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:16:14 2011 +0100 Merge branches 'CloakUserHost', 'QuitOnHTTP' and 'bug72-WHOIS-List' * CloakUserHost: Add a note not to use a percent sign ("%") in CloakHost variable Rename ClientHost to CloakHost, and ClientUserNick to CloakUserToNick Don't use "the.net" in sample-ngircd.conf, use "example.net" ngircd.conf.5: document "ClientHost" and "ClientUserNick" Move "ClientHost" and "ClientUserNick" to end of [Global] section ClientUserNick setting ClientHost setting * QuitOnHTTP: Only "handle" HTTP commands on unregistered connections Don't use IRC_QUIT_HTTP() if STRICT_RFC is #define'd IRC_QUIT_HTTP(): enhance error message Move IRC_QUIT_HTTP() below IRC_QUIT() quit on HTTP commands: GET & POST * bug72-WHOIS-List: Add "whois-test" to testsuite and distribution archive Add support for up to 3 targets in WHOIS queries. ---

1 0

Alexander Barton : Add a note not to use a percent sign ("%") in CloakHost variable
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: acd7a5d6d41ca8017d3c2217b0c0bde129b4e041 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=acd7a5d6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:02:39 2011 +0100 Add a note not to use a percent sign ("%") in CloakHost variable The percent sign is reserved for future extensions, for example to expand some variables like %H to a hash value of the real host name ... Idea by kaFux in #ngircd. --- doc/sample-ngircd.conf.tmpl | 2 ++ man/ngircd.conf.5.tmpl | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index a2eeee9..e07b520 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -155,6 +155,8 @@ ;MaxNickLength = 9 # Set this hostname for every client instead of the real one. + # Please note: don't use the percentage sign ("%"), it is reserved for + # future extensions! ;CloakHost = irc.example.net # Set every clients' user name to their nick name diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index fa77c64..131fa29 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -240,6 +240,12 @@ length! \fBCloakHost\fR Set this hostname for every client instead of the real one. Default: empty, don't change. +.PP +.RS +.B Please note: +.br +Don't use the percentage sign ("%"), it is reserved for future extensions! +.RE .TP \fBCloakUserToNick\fR Set every clients' user name to their nick name and hide the one supplied

1 0