ngIRCd GIT Updates

ngircd-commits@lists.barton.de

1 Teilnehmer
2443 Diskussionen

Alexander Barton : channel modes: only handle MAX_CMODES_ARG modes with arguments
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: 98493077a2d044aa08ee5cb4bd7054579e30fb57 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=98493077… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 17:27:29 2012 +0100 channel modes: only handle MAX_CMODES_ARG modes with arguments Limit the MODE command to handle a maximum of MAX_CMODES_ARG (5) channel modes that require an argument (+Ibkl) per call. Please note: Further modes that require arguments are silently ignored and end the handling of any further modes. This is similar to the behavior of ircd2.11 (silently ignores but seems to handle other modes) as well as ircd-seven (silently ignores but handles some(!) other modes) ... --- src/ngircd/defines.h | 5 ++++- src/ngircd/irc-mode.c | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 4bcb6af..b894dbc 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.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) * * 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 @@ -32,6 +32,9 @@ #define MAX_WHOWAS 64 /* Max. number of WHOWAS items */ #define DEFAULT_WHOWAS 5 /* default count for WHOWAS command */ +#define MAX_CMODES_ARG 5 /* Max. number of channel modes with + * arguments per MODE command */ + #define CONNECTION_POOL 100 /* Size of default connection pool */ #define CLIENT_ID_LEN 64 /* Max. length of an IRC ID; see RFC diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 01f8762..9afe907 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -375,7 +375,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr; bool connected, set, skiponce, retval, onchannel, modeok, use_servermode; - int mode_arg, arg_arg; + int mode_arg, arg_arg, mode_arg_count = 0; CLIENT *client; long l; size_t len; @@ -491,6 +491,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), Channel_Name(Channel)); break; case 'k': /* Channel key */ + if (mode_arg_count++ >= MAX_CMODES_ARG) + break; if (!set) { if (modeok) x[0] = *mode_ptr; @@ -525,6 +527,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) } break; case 'l': /* Member limit */ + if (mode_arg_count++ >= MAX_CMODES_ARG) + break; if (!set) { if (modeok) x[0] = *mode_ptr; @@ -635,6 +639,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* --- Channel lists --- */ case 'I': /* Invite lists */ case 'b': /* Ban lists */ + if (mode_arg_count++ >= MAX_CMODES_ARG) + break; if (arg_arg > mode_arg) { /* modify list */ if (modeok) {

1 0

Alexander Barton : Fix handling of channel mode sequence with/ without arguments
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: 1fa2af5b3a95cad24c3e8b56ee7e57aa5084bfdb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1fa2af5b… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 17:24:55 2012 +0100 Fix handling of channel mode sequence with/without arguments For example, don't generate wrong error messages when handling "MODE #chan +IIIIItn *!aa@b *!bb@c *!cc@d *!dd@e *!ee@f". --- src/ngircd/irc-mode.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index d8329b1..01f8762 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.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 @@ -280,7 +280,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) /* Are there changed modes? */ if (the_modes[1]) { - /* Remoce needless action modifier characters */ + /* Remove needless action modifier characters */ len = strlen(the_modes) - 1; if (the_modes[len] == '+' || the_modes[len] == '-') the_modes[len] = '\0'; @@ -428,6 +428,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) mode_ptr++; if (!*mode_ptr) { /* Try next argument if there's any */ + if (arg_arg < 0) + break; if (arg_arg > mode_arg) mode_arg = arg_arg; else

1 0

Alexander Barton : Conn_Write(): Make sure there is a client when detecting its type
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: 05cc9bf9b064c7048f6b197462a686c5a9100798 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=05cc9bf9… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 03:26:24 2012 +0100 Conn_Write(): Make sure there is a client when detecting its type The assert(client != NULL) got triggered during our tests, so there is an error path that resulted in the connection being still established (sock >= 0) but the client structure already freed. So Conn_Write() should handle it! --- src/ngircd/conn.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index d9d73e8..5f3c18a 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -936,22 +936,25 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) assert( Data != NULL ); assert( Len > 0 ); - c = Conn_GetClient(Idx); - assert( c != NULL); - - /* Servers do get special write buffer limits, so they can generate - * all the messages that are required while peering. */ - if (Client_Type(c) == CLIENT_SERVER) - writebuf_limit = WRITEBUFFER_SLINK_LEN; - /* Is the socket still open? A previous call to Conn_Write() * may have closed the connection due to a fatal error. * In this case it is sufficient to return an error, as well. */ - if( My_Connections[Idx].sock <= NONE ) { + if (My_Connections[Idx].sock <= NONE) { LogDebug("Skipped write on closed socket (connection %d).", Idx); return false; } + /* Make sure that there still exists a CLIENT structure associated + * with this connection and check if this is a server or not: */ + c = Conn_GetClient(Idx); + if (c) { + /* Servers do get special write buffer limits, so they can + * generate all the messages that are required while peering. */ + if (Client_Type(c) == CLIENT_SERVER) + writebuf_limit = WRITEBUFFER_SLINK_LEN; + } else + LogDebug("Write on socket without client (connection %d)!?", Idx); + #ifdef ZLIB if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) { /* Compressed link:

1 0

Alexander Barton : Proc_Close(): Only close socket if it is still valid
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: cc06e1ff89ae4b7ffc8d95a8ab1d9b6787a5d142 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cc06e1ff… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 02:26:04 2012 +0100 Proc_Close(): Only close socket if it is still valid It could be invalid when calling Proc_Close() a 2nd time, for exmaple, which could happen when we hit a timeout doing IDENT requests :-( --- src/ngircd/proc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index 7addb47..e062cd0 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -154,7 +154,10 @@ Proc_Read(PROC_STAT *proc, void *buffer, size_t buflen) GLOBAL void Proc_Close(PROC_STAT *proc) { - io_close(proc->pipe_fd); + /* Close socket, if it exists */ + if (proc->pipe_fd >= 0) + io_close(proc->pipe_fd); + Proc_InitStruct(proc); }

1 0

Alexander Barton : WHOIS command: make sure matching is case-insensitive
by alex＠arthur.barton.de 05 Jan '12

05 Jan '12

Module: ngircd.git Branch: master Commit: 9fbf592924d4ed1e37b42f295ec9c9ab0fc3cd08 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9fbf5929… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jan 5 00:51:39 2012 +0100 WHOIS command: make sure matching is case-insensitive And make sure that RPL_ENDOFWHOIS replies with the unmodified mask like it has been received from the client. --- src/ngircd/irc-info.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 883893f..42b2264 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1129,7 +1129,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) unsigned int match_count = 0, found = 0; bool has_wildcards, is_remote; bool got_wildcard = false; - const char *query; + char mask[COMMAND_LEN], *query; assert( Client != NULL ); assert( Req != NULL ); @@ -1170,7 +1170,8 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) Req->argv[0], Req->argv[1]); is_remote = Client_Conn(from) < 0; - for (query = strtok(Req->argv[Req->argc - 1], ","); + strlcpy(mask, Req->argv[Req->argc - 1], sizeof(mask)); + for (query = strtok(ngt_LowerStr(mask), ","); query && found < 3; query = strtok(NULL, ","), found++) {

1 0

Alexander Barton : WHOIS command: don't anser queries for IRC servers
by alex＠arthur.barton.de 05 Jan '12

05 Jan '12

Module: ngircd.git Branch: master Commit: adf92302bf9bb6420acd1f1153515586794b1574 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=adf92302… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jan 5 00:24:46 2012 +0100 WHOIS command: don't anser queries for IRC servers Thanks to Cahata for spotting this! --- src/ngircd/irc-info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index c2f4910..883893f 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1185,7 +1185,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) */ if (!has_wildcards || is_remote) { c = Client_Search(query); - if (c) { + if (c && Client_Type(c) == CLIENT_USER) { if (!IRC_WHOIS_SendReply(Client, from, c)) return DISCONNECTED; } else {

1 0

Alexander Barton : WHOIS command: make sure the reply ends with RPL_ENDOFWHOIS
by alex＠arthur.barton.de 05 Jan '12

05 Jan '12

Module: ngircd.git Branch: master Commit: 566a451299cab41810bafc5ed11a5021e30d9b3d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=566a4512… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jan 5 00:22:57 2012 +0100 WHOIS command: make sure the reply ends with RPL_ENDOFWHOIS Up to now, each reply for itself ended in RPL_ENDOFWHOIS and queries for unknown nick names lacked the RPL_ENDOFWHOIS -- both is wrong. --- src/ngircd/irc-info.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 5e56949..c2f4910 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1109,8 +1109,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) Client_Away(c))) return DISCONNECTED; - return IRC_WriteStrClient(from, RPL_ENDOFWHOIS_MSG, - Client_ID(from), Client_ID(c)); + return CONNECTED; } /* IRC_WHOIS_SendReply */ @@ -1219,10 +1218,12 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) } if (match_count == 0) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->argv[Req->argc - 1]); + IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), + Req->argv[Req->argc - 1]); } - return CONNECTED; + return IRC_WriteStrClient(from, RPL_ENDOFWHOIS_MSG, + Client_ID(from), Req->argv[Req->argc - 1]); } /* IRC_WHOIS */

1 0

Alexander Barton : README: update features list, borrow from list on our website
by alex＠arthur.barton.de 04 Jan '12

04 Jan '12

Module: ngircd.git Branch: master Commit: e0f8ce093ad2cc389fe8ffd404addaf609451b3f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e0f8ce09… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 4 23:30:55 2012 +0100 README: update features list, borrow from list on our website --- README | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README b/README index f9b3662..1ea96ef 100644 --- a/README +++ b/README @@ -44,12 +44,14 @@ WHOIS, WHOWAS. III. Features (or: why use ngIRCd?) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- no problems with servers which have dynamic IP addresses -- simple, easy understandable configuration file, -- freely published open-source C source code, -- ngIRCd will be developed on in the future. +- well arranged (lean) configuration file +- simple to build/install, configure and maintain +- supports IPv6 and SSL +- no problems with servers that have dynamic IP addresses +- freely available, modern, portable and tidy C-source - wide field of supported platforms, including AIX, A/UX, FreeBSD, HP-UX, IRIX, Linux, Mac OS X, NetBSD, OpenBSD, Solaris, and Windows with Cygwin. +- ngIRCd is being actively developed since 2001. IV. Documentation

1 0

Alexander Barton : LINKS command: support <mask> parameter
by alex＠arthur.barton.de 04 Jan '12

04 Jan '12

Module: ngircd.git Branch: master Commit: 5e3449a241b3ee1e8f60bc33c0b1342543254397 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5e3449a2… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 4 22:51:02 2012 +0100 LINKS command: support <mask> parameter The <mask> can be used to limit the servers shown in the listing. --- src/ngircd/irc-info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index dfc67b9..5e56949 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -254,7 +254,8 @@ IRC_LINKS(CLIENT *Client, REQUEST *Req) c = Client_First(); while (c) { - if (Client_Type(c) == CLIENT_SERVER) { + if (Client_Type(c) == CLIENT_SERVER + && MatchCaseInsensitive(mask, Client_ID(c))) { if (!IRC_WriteStrClient(from, RPL_LINKS_MSG, Client_ID(from), Client_ID(c), Client_ID(Client_TopServer(c)

1 0

Alexander Barton : IRC_LINKS(): Code cleanup; more documentation
by alex＠arthur.barton.de 04 Jan '12

04 Jan '12

Module: ngircd.git Branch: master Commit: 762b0325df921622686096affc7ead41ba028959 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=762b0325… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 4 22:49:18 2012 +0100 IRC_LINKS(): Code cleanup; more documentation --- src/ngircd/irc-info.c | 86 ++++++++++++++++++++++++++++++------------------ 1 files changed, 54 insertions(+), 32 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 092ca0a..dfc67b9 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -200,51 +200,73 @@ IRC_ISON( CLIENT *Client, REQUEST *Req ) } /* IRC_ISON */ +/** + * Handler for the IRC "LINKS" command. + * + * See RFC 2812, 3.4.5 "Links message". + * + * @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_LINKS( CLIENT *Client, REQUEST *Req ) +IRC_LINKS(CLIENT *Client, REQUEST *Req) { CLIENT *target, *from, *c; char *mask; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); - if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + IRC_SetPenalty(Client, 1); - /* Server-Mask ermitteln */ - if( Req->argc > 0 ) mask = Req->argv[Req->argc - 1]; - else mask = "*"; + if (Req->argc > 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - /* Absender ermitteln */ - if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); - else from = Client; - if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + /* Get pointer to server mask or "*", if none given */ + if (Req->argc > 0) + mask = Req->argv[Req->argc - 1]; + else + mask = "*"; - /* An anderen Server forwarden? */ - if( Req->argc == 2 ) - { - target = Client_Search( Req->argv[0] ); - if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] ); - else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LINKS %s %s", Req->argv[0], Req->argv[1] ); - } + if (Client_Type(Client) == CLIENT_SERVER) + from = Client_Search(Req->prefix); + else + from = Client; + if (!from) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); - /* Wer ist der Absender? */ - if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix ); - else target = Client; - if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + /* Forward? */ + if (Req->argc == 2) { + target = Client_Search(Req->argv[0]); + if (! target || Client_Type(target) != CLIENT_SERVER) + return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + Client_ID(from), + Req->argv[0] ); + else + if (target != Client_ThisServer()) + return IRC_WriteStrClientPrefix(target, from, + "LINKS %s %s", Req->argv[0], + Req->argv[1]); + } - c = Client_First( ); - while( c ) - { - if( Client_Type( c ) == CLIENT_SERVER ) - { - if( ! IRC_WriteStrClient( target, RPL_LINKS_MSG, Client_ID( target ), Client_ID( c ), Client_ID( Client_TopServer( c ) ? Client_TopServer( c ) : Client_ThisServer( )), Client_Hops( c ), Client_Info( c ))) return DISCONNECTED; + c = Client_First(); + while (c) { + if (Client_Type(c) == CLIENT_SERVER) { + if (!IRC_WriteStrClient(from, RPL_LINKS_MSG, + Client_ID(from), Client_ID(c), + Client_ID(Client_TopServer(c) + ? Client_TopServer(c) + : Client_ThisServer()), + Client_Hops(c), Client_Info(c))) + return DISCONNECTED; } - c = Client_Next( c ); + c = Client_Next(c); } - - IRC_SetPenalty( target, 1 ); - return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask ); + return IRC_WriteStrClient(from, RPL_ENDOFLINKS_MSG, + Client_ID(from), mask); } /* IRC_LINKS */

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