- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Implement Help() function parsing and returning the help text
by alex＠arthur.barton.de 02 Jan '13

02 Jan '13

Module: ngircd.git Branch: master Commit: 289a26e9e43be303a7355ab530ddcaa84aca60b9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=289a26e9… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 1 14:57:03 2013 +0100 Implement Help() function parsing and returning the help text This function parses the already read in help text and sends the requested portions to the user. Parsing is done as following when a user user issues a "HELP <cmd>" command: 1. Search the file for a line "- <cmd>", 2. Output all subsequent lines that start with a TAB (ASCII 9) character to the client using NOTICE commands, treat lines containing a single "." after the TAB as empty lines. 3. Break at the first line not starting with a TAB character. This format allows to have information to each command stored in this file which will not be sent to an IRC user requesting help which enables us to have additional annotations stored here which further describe the origin, implementation details, or limits of the specific command. A special "Intro" block is returned to the user when the HELP command is used without a command name. --- src/ngircd/irc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 1a0d725..f6b9dc5 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -44,6 +44,7 @@ static bool Send_Message PARAMS((CLIENT *Client, REQUEST *Req, int ForceType, static bool Send_Message_Mask PARAMS((CLIENT *from, char *command, char *targetMask, char *message, bool SendErrors)); +static bool Help PARAMS((CLIENT *Client, const char *Topic)); /** @@ -320,10 +321,23 @@ IRC_HELP(CLIENT *Client, REQUEST *Req) assert(Req != NULL); /* Bad number of arguments? */ - if (Req->argc > 0) + if (Req->argc > 1) return IRC_WriteStrClient(Client, ERR_NORECIPIENT_MSG, Client_ID(Client), Req->command); + IRC_SetPenalty(Client, 2); + + if ((Req->argc == 0 && array_bytes(&Conf_Helptext) > 0) + || (Req->argc >= 1 && strcasecmp(Req->argv[0], "Commands") != 0)) { + /* Help text available and requested */ + if (Req->argc >= 1) + return Help(Client, Req->argv[0]); + + if (!Help(Client, "Intro")) + return DISCONNECTED; + return CONNECTED; + } + cmd = Parse_GetCommandStruct(); while(cmd->name) { if (!IRC_WriteStrClient(Client, "NOTICE %s :%s", @@ -331,12 +345,76 @@ IRC_HELP(CLIENT *Client, REQUEST *Req) return DISCONNECTED; cmd++; } - - IRC_SetPenalty(Client, 2); return CONNECTED; } /* IRC_HELP */ +/** + * Send help for a given topic to the client. + * + * @param Client The client requesting help. + * @param Topoc The help topic requested. + * @return CONNECTED or DISCONNECTED. + */ +static bool +Help(CLIENT *Client, const char *Topic) +{ + char *line; + size_t helptext_len, len_str, idx_start, lines = 0; + bool in_article = false; + + assert(Client != NULL); + assert(Topic != NULL); + + helptext_len = array_bytes(&Conf_Helptext); + line = array_start(&Conf_Helptext); + while (helptext_len > 0) { + len_str = strlen(line) + 1; + assert(helptext_len >= len_str); + helptext_len -= len_str; + + if (in_article) { + /* The first character in each article text line must + * be a TAB (ASCII 9) character which will be stripped + * in the output. If it is not a TAB, the end of the + * article has been reached. */ + if (line[0] != '\t') { + if (lines > 0) + return CONNECTED; + else + break; + } + + /* A single '.' character indicates an empty line */ + if (line[1] == '.' && line[2] == '\0') + idx_start = 2; + else + idx_start = 1; + + if (!IRC_WriteStrClient(Client, "NOTICE %s :%s", + Client_ID(Client), + &line[idx_start])) + return DISCONNECTED; + lines++; + + } else { + if (line[0] == '-' && line[1] == ' ' + && strcasecmp(&line[2], Topic) == 0) + in_article = true; + } + + line += len_str; + } + + /* Help topic not found (or empty)! */ + if (!IRC_WriteStrClient(Client, "NOTICE %s :No help for \"%s\" found!", + Client_ID(Client), Topic)) + return DISCONNECTED; + + return CONNECTED; +} + + static char * #ifdef ZLIB Option_String(CONN_ID Idx)

1 0

Alexander Barton : Add doc/Commands.txt which should document all commands
by alex＠arthur.barton.de 02 Jan '13

02 Jan '13

Module: ngircd.git Branch: master Commit: 8ec09e3ca47a8d2ca0502831d77f7edc8c4749a6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8ec09e3c… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 1 15:09:09 2013 +0100 Add doc/Commands.txt which should document all commands This document can be used as "help text", too, see configuration option "HelpFile" in ngircd.conf(5). Please note that this file in its current state is far from complete, only a few commands are documented, but you should get an idea how it works. So please send in patches adding the remaining parts! :-) --- doc/Commands.txt | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/Makefile.am | 1 + 2 files changed, 220 insertions(+) diff --git a/doc/Commands.txt b/doc/Commands.txt new file mode 100644 index 0000000..e9b7873 --- /dev/null +++ b/doc/Commands.txt @@ -0,0 +1,219 @@ + + ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ + + (c)2001-2013 Alexander Barton and Contributors. + ngIRCd is free software and published under the + terms of the GNU General Public License. + + -- Commands.txt -- + + +This file lists all commands available on ngIRCd. It is written in a format +that is human readable as well as machine parseable and therefore can be used +as "help text file" of the daemon. + +In short, the HELP command parses this file as following when a user user +issues a "HELP <cmd>" command: + + 1. Search the file for a line "- <cmd>", + 2. Output all subsequent lines that start with a TAB (ASCII 9) character + to the client using NOTICE commands, treat lines containing a single "." + after the TAB as empty lines. + 3. Break at the first line not starting with a TAB character. + +This format allows to have information to each command stored in this file +which will not be sent to an IRC user requesting help which enables us to +have additional annotations stored here which further describe the origin, +implementation details, or limits of the specific command. + +A special "Intro" block is returned to the user when the HELP command is +used without a command name: + + +- Intro + This is ngIRCd, a server software for Internet Relay Chat (IRC) + networks. You can find more information about ngIRCd on its homepage: + <http://ngircd.barton.de> + . + Use "HELP COMMANDS" to get a list of all available commands and + "HELP <command-name>" to get help for a specific IRC command, for + example "HELP quit" or "HELP privmsg". + + +General Commands +~~~~~~~~~~~~~~~~ + +- AWAY + +- CAP + +- CHARCONV + +- HELP + HELP [<command>] + . + Show help information for a specific IRC <command>. The <command> name + is case-insensitive. + . + Use the command "HELP Commands" to get a list of all available commands. + + The HELP command isn't specified by any RFC but implemented by most + daemons. If no help text could be read in, ngIRCd outputs a list of all + implemented commands when receiving a plain "HELP" command as well as + on "HELP Commands". + + ngIRCd replies using "NOTICE" commands like ircd 2.10/2.11; other + implementations are using numerics 704, 705, and 706. + + +- MODE + +- NICK + +- NOTICE + +- PASS + +- PING + +- PONG + +- PRIVMSG + +- QUIT + QUIT [<quit-message>] + . + End IRC session and disconnect from the server. + . + If a <quit-message> has been given, it is displayed to all the + channels that you are a member of when leaving. + +- USER + +- WALLOPS + +- WEBIRC + + +Status and Informational Commands +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- INFO + +- ISON + +- LINKS + +- LUSERS + +- METADATA + +- MOTD + +- NAMES + +- STATS + +- TIME + +- TRACE + +- USERHOST + +- VERSION + +- WHO + +- WHOIS + +- WHOWAS + + +Channel Commands +~~~~~~~~~~~~~~~~ + +- INVITE + +- JOIN + +- KICK + +- LIST + +- PART + +- TOPIC + + +Administrative Commands +~~~~~~~~~~~~~~~~~~~~~~~ + +- ADMIN + ADMIN [<server>] + . + Show administartive information about an IRC server in the network. + If no server name has been given, the local server will respond. + +- CONNECT + +- DIE + +- DISCONNECT + +- GLINE + +- KILL + +- KLINE + +- OPER + +- REHASH + +- RESTART + + +IRC Service Commands +~~~~~~~~~~~~~~~~~~~~~~~~ + +- SERVICE + +- SERVLIST + +- SQUERY + +- SVSNICK + + +Server Protocol Commands +~~~~~~~~~~~~~~~~~~~~~~~~ + +- CHANINFO + +- ERROR + ERROR [<message> [<> [...]]] + . + Return an error message to the server. The first parameter, if given, + will be logged by the server, all further parameters are silently + ignored. + . + This command is silently ignored on non-server and non-service links. + +- NJOIN + +- SERVER + +- SQUIT + + +Dummy Commands +~~~~~~~~~~~~~~ + +- SUMMON + +- USERS + +- GET + +- POST diff --git a/doc/Makefile.am b/doc/Makefile.am index 2b9b3aa..eb6fa93 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -19,6 +19,7 @@ SUFFIXES = .tmpl static_docs = \ Bopm.txt \ Capabilities.txt \ + Commands.txt \ Contributing.txt \ FAQ.txt \ GIT.txt \

1 0

Alexander Barton : Refactor Read_Motd() into Read_TextFile()
by alex＠arthur.barton.de 02 Jan '13

02 Jan '13

Module: ngircd.git Branch: master Commit: 9e1c25a889d7a18c1df7f13da64dc38e1a3a9eec URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9e1c25a8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 31 19:26:31 2012 +0100 Refactor Read_Motd() into Read_TextFile() Now this function allows to read arbitrary text files into arrays. --- src/ngircd/conf.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index bea4d61..423221c 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -784,39 +784,44 @@ no_listenports(void) } /** - * Read MOTD ("message of the day") file. + * Read contents of a text file into an array. + * + * This function is used to read the MOTD and help text file, for exampe. * * @param filename Name of the file to read. + * @return true, when the file has been read in. */ -static void -Read_Motd(const char *filename) +static bool +Read_TextFile(const char *Filename, const char *Name, array *Destination) { char line[127]; FILE *fp; + int line_no = 1; - if (*filename == '\0') - return; + if (*Filename == '\0') + return false; - fp = fopen(filename, "r"); + fp = fopen(Filename, "r"); if (!fp) { - Config_Error(LOG_WARNING, "Can't read MOTD file \"%s\": %s", - filename, strerror(errno)); - return; + Config_Error(LOG_WARNING, "Can't read %s file \"%s\": %s", + Name, Filename, strerror(errno)); + return false; } - array_free(&Conf_Motd); - Using_MotdFile = true; - + array_free(Destination); while (fgets(line, (int)sizeof line, fp)) { - ngt_TrimLastChr( line, '\n'); + ngt_TrimLastChr(line, '\n'); /* add text including \0 */ - if (!array_catb(&Conf_Motd, line, strlen(line) + 1)) { - Log(LOG_WARNING, "Cannot add MOTD text: %s", strerror(errno)); + if (!array_catb(Destination, line, strlen(line) + 1)) { + Log(LOG_WARNING, "Cannot read/add \"%s\", line %d: %s", + Filename, line_no, strerror(errno)); break; } + line_no++; } fclose(fp); + return true; } /** @@ -1037,8 +1042,10 @@ Read_Config(bool TestOnly, bool IsStarting) } /* No MOTD phrase configured? (re)try motd file. */ - if (array_bytes(&Conf_Motd) == 0) - Read_Motd(Conf_MotdFile); + if (array_bytes(&Conf_Motd) == 0) { + if (Read_TextFile(Conf_MotdFile, "MOTD", &Conf_Motd)) + Using_MotdFile = true; + } #ifdef SSL_SUPPORT /* Make sure that all SSL-related files are readable */

1 0

Tag rel-20.1: Alexander Barton : ngIRCd Release 20.1
by alex＠arthur.barton.de 02 Jan '13

02 Jan '13

Module: ngircd.git Branch: refs/tags/rel-20.1 Tag: de78434aa26d1bb3da2604a9a787d56f3d9b121a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=de78434aa26… Tagger: Alexander Barton <alex(a)barton.de> Date: Wed Jan 2 22:38:08 2013 +0100 ngIRCd Release 20.1

1 0

Alexander Barton : ngIRCd Release 20.1
by alex＠arthur.barton.de 02 Jan '13

02 Jan '13

Module: ngircd.git Branch: master Commit: 21493731dffa0f5d9f62d24cdef290be6a6856fd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=21493731… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 2 22:37:55 2013 +0100 ngIRCd Release 20.1 --- ChangeLog | 16 +++++++++++++++- NEWS | 4 ++++ contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e2a042..a4cfdb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,13 +2,27 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. -- ChangeLog -- +ngIRCd 20.1 (2013-01-02) + + - Allow ERROR command on server and service links only, ignore them and + add a penalty time on all other link types. + - Enforced mode setting by IRC Operators: Only check the channel user + modes of the initiator if he is joined to the channel and not an IRC + operator enforcing modes (which requires the configuration option + "OperCanUseMode" to be enabled), because trying to check channel user + modes of a non-member results in an assertion when running with debug + code or could crash the daemon otherwise. This closes bug #147, thanks + to James Kirwill <james.kirwill(a)bk.ru> for tracking this down! + - Fix build system to cope with spaces in path names. + - Code cleanups, mostly to fix build warnings on Cygwin. + ngIRCd 20 (2012-12-17) - Allow user names ("INDENT") up to 20 characters when ngIRCd has not diff --git a/NEWS b/NEWS index c3f9c49..be743e6 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,10 @@ -- NEWS -- +ngIRCd 20.1 (2013-01-02) + + - This release is a bugfix release only, without new features. + ngIRCd 20 (2012-12-17) - Allow user names ("INDENT") up to 20 characters when ngIRCd has not diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 2a9c2df..03c3df6 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (20.1-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 20.1. + + -- Alexander Barton <alex(a)barton.de> Wed, 02 Jan 2013 22:37:26 +0100 + ngircd (20-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 20. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 9632bc0..fa0a6a1 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 20 +%define version 20.1 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Update Copyright notices for 2013
by alex＠arthur.barton.de 01 Jan '13

01 Jan '13

Module: ngircd.git Branch: master Commit: 1f59821270e7298b380183778672e6db9c87971b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1f598212… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 1 19:23:56 2013 +0100 Update Copyright notices for 2013 --- AUTHORS | 2 +- INSTALL | 2 +- NEWS | 2 +- README | 2 +- contrib/MacOSX/ngIRCd.pmdoc/index.xml | 2 +- src/ngircd/ngircd.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index 986beef..1d061a6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/INSTALL b/INSTALL index b445958..de60feb 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/NEWS b/NEWS index 96ecdc8..c3f9c49 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/README b/README index 11d140d..c903aa1 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/contrib/MacOSX/ngIRCd.pmdoc/index.xml b/contrib/MacOSX/ngIRCd.pmdoc/index.xml index 34b3baa..e665bc6 100644 --- a/contrib/MacOSX/ngIRCd.pmdoc/index.xml +++ b/contrib/MacOSX/ngIRCd.pmdoc/index.xml @@ -5,7 +5,7 @@ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural \f0\i\fs24 \cf0 ngIRCd -- The Next Generation IRC Daemon\ -Copyright (c)2001-2011 Alexander Barton and Contributors.\ +Copyright (c)2001-2013 Alexander Barton and Contributors.\ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural \i0 \cf0 \ diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index f016b6a..dfae336 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2013 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 @@ -460,7 +460,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2012 Alexander Barton (<alex(a)barton.de>) and Contributors." ); + puts( "Copyright (c)2001-2013 Alexander Barton (<alex(a)barton.de>) and Contributors." ); puts( "Homepage: <http://ngircd.barton.de/>\n" ); puts( "This is free software; see the source for copying conditions. There is NO" ); puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );

1 0

Alexander Barton : Allow ERROR command on server and service links only
by alex＠arthur.barton.de 31 Dez '12

31 Dez '12

Module: ngircd.git Branch: master Commit: 3e47bc9af511716bbe388f0a29b5fdbb617cee4c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3e47bc9a… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 31 21:46:41 2012 +0100 Allow ERROR command on server and service links only Ignore it and add a penalty time on all other link types. --- src/ngircd/irc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 63c4813..a678f90 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -81,6 +81,17 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); + if (Client_Type(Client) != CLIENT_GOTPASS + && Client_Type(Client) != CLIENT_GOTPASS_2813 + && Client_Type(Client) != CLIENT_UNKNOWNSERVER + && Client_Type(Client) != CLIENT_SERVER + && Client_Type(Client) != CLIENT_SERVICE) { + LogDebug("Ignored ERROR command from \"%s\" ...", + Client_Mask(Client)); + IRC_SetPenalty(Client, 2); + return CONNECTED; + } + if (Req->argc < 1) Log(LOG_NOTICE, "Got ERROR from \"%s\"!", Client_Mask(Client));

1 0

Alexander Barton : Get rid of Conn_ResetPenalty(), it is unused
by alex＠arthur.barton.de 31 Dez '12

31 Dez '12

Module: ngircd.git Branch: master Commit: 5d921984873b708c2f91bed01689f6351d95c233 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5d921984… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 31 18:23:21 2012 +0100 Get rid of Conn_ResetPenalty(), it is unused --- src/ngircd/conn-func.c | 18 ------------------ src/ngircd/conn-func.h | 1 - 2 files changed, 19 deletions(-) diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index e81a79e..9647674 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -117,24 +117,6 @@ Conn_SetPenalty(CONN_ID Idx, time_t Seconds) } /* Conn_SetPenalty */ -/** - * Reset the "penalty time" for one connection. - * - * @param Idx Connection index. - * @see Conn_SetPenalty - */ -GLOBAL void -Conn_ResetPenalty(CONN_ID Idx) -{ - assert(Idx > NONE); - - My_Connections[Idx].delaytime = 0; -#ifdef DEBUG - Log(LOG_DEBUG, "Penalty time on connection %d has been reset."); -#endif -} /* Conn_ResetPenalty */ - - GLOBAL void Conn_ClearFlags( void ) { diff --git a/src/ngircd/conn-func.h b/src/ngircd/conn-func.h index 21bbcdb..1d05acc 100644 --- a/src/ngircd/conn-func.h +++ b/src/ngircd/conn-func.h @@ -45,7 +45,6 @@ GLOBAL long Conn_RecvBytes PARAMS(( CONN_ID Idx )); GLOBAL const char *Conn_IPA PARAMS(( CONN_ID Idx )); GLOBAL void Conn_SetPenalty PARAMS(( CONN_ID Idx, time_t Seconds )); -GLOBAL void Conn_ResetPenalty PARAMS(( CONN_ID Idx )); GLOBAL void Conn_ClearFlags PARAMS(( void )); GLOBAL int Conn_Flag PARAMS(( CONN_ID Idx ));

1 0

Alexander Barton : Mode setting: only check channel user modes when on channel
by alex＠arthur.barton.de 31 Dez '12

31 Dez '12

Module: ngircd.git Branch: master Commit: 20ddffca0d5ae5393adc57b67ba90e15d33e2ee3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=20ddffca… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 31 18:13:18 2012 +0100 Mode setting: only check channel user modes when on channel Only check the channel user modes of the initiator if he is joined to this channel and not an IRC operator enforcing modes (which requires the configuration option "OperCanUseMode" to be enabled), because trying to check channel user modes of a non-member results in this assertion: Assertion failed: (cl2chan != NULL), function Channel_UserModes, file channel.c, line 742. This closes bug #147, thanks to James Kirwill <james.kirwill(a)bk.ru> for tracking this down! --- src/ngircd/irc-mode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 3221997..a63a0f4 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -550,7 +550,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if (arg_arg >= Req->argc) arg_arg = -1; - if(!is_machine) { + if(!is_machine && !is_oper) { o_mode_ptr = Channel_UserModes(Channel, Client); while( *o_mode_ptr ) { if ( *o_mode_ptr == 'q')

1 0

Alexander Barton : Add some more casts in assert() statemens
by alex＠arthur.barton.de 25 Dez '12

25 Dez '12

Module: ngircd.git Branch: master Commit: 25e56a5e837173a567a0873bd5a9ccc126cff333 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=25e56a5e… Author: Alexander Barton <alex(a)barton.de> Date: Tue Dec 25 19:21:40 2012 +0100 Add some more casts in assert() statemens This fixes the following warning messages of gcc 4.5.3 on Cygwin when building with debug code enabled: ng_ipaddr.c: In function ‘ng_ipaddr_init’: ng_ipaddr.c:52:2: warning: comparison between signed and unsigned integer expressions ng_ipaddr.c:53:20: warning: comparison between signed and unsigned integer expressions resolve.c: In function ‘ForwardLookup’: resolve.c:271:3: warning: comparison between signed and unsigned integer expressions --- src/ipaddr/ng_ipaddr.c | 4 ++-- src/ngircd/resolve.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ipaddr/ng_ipaddr.c b/src/ipaddr/ng_ipaddr.c index 05ef6ec..9cf35ec 100644 --- a/src/ipaddr/ng_ipaddr.c +++ b/src/ipaddr/ng_ipaddr.c @@ -49,8 +49,8 @@ ng_ipaddr_init(ng_ipaddr_t *addr, const char *ip_str, UINT16 port) if (ret != 0) return false; - assert(sizeof(*addr) >= res0->ai_addrlen); - if (sizeof(*addr) >= res0->ai_addrlen) + assert(sizeof(*addr) >= (size_t)res0->ai_addrlen); + if (sizeof(*addr) >= (size_t)res0->ai_addrlen) memcpy(addr, res0->ai_addr, res0->ai_addrlen); else ret = -1; diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 3f99b3a..6078da8 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -268,7 +268,7 @@ ForwardLookup(const char *hostname, array *IpAddr, int af) } for (a = ai_results; a != NULL; a = a->ai_next) { - assert(a->ai_addrlen <= sizeof(addr)); + assert((size_t)a->ai_addrlen <= sizeof(addr)); if ((size_t)a->ai_addrlen > sizeof(addr)) continue;

1 0