ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2443 Diskussionen

Florian Westphal : conn-zip: fix error handling
by fw＠arthur.barton.de 21 Apr '09

21 Apr '09

Module: ngircd.git Branch: master Commit: 84eaed6c9afa92dcfd45181d5796cd7efd7e8b98 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=84eaed6c… Author: Florian Westphal <fw(a)strlen.de> Date: Tue Apr 21 19:49:15 2009 +0200 conn-zip: fix error handling callers of (Un)Zip_Buffer() assume that the function closes the connection on error. However, this was not always the case. --- src/ngircd/conn-zip.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c index 0b9161f..24577ed 100644 --- a/src/ngircd/conn-zip.c +++ b/src/ngircd/conn-zip.c @@ -80,10 +80,12 @@ Zip_InitConn( CONN_ID Idx ) * compression ratios. * If the (pre-)compression buffer is full, we try to flush it ("actually * compress some data") and to add the new (uncompressed) data afterwards. + * This function closes the connection on error. * @param Idx Connection handle. * @param Data Pointer to the data. * @param Len Length of the data to add. - * @return true on success, false otherwise. */ + * @return true on success, false otherwise. + */ GLOBAL bool Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len ) { @@ -102,9 +104,11 @@ Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len ) /* check again; if zip buf is still too large do not append data: * otherwise the zip wbuf would grow too large */ buflen = array_bytes(&My_Connections[Idx].zip.wbuf); - if (buflen + Len >= WRITEBUFFER_SLINK_LEN) + if (buflen + Len >= WRITEBUFFER_SLINK_LEN) { + Log(LOG_ALERT, "Zip Write Buffer overflow: %lu bytes\n", buflen + Len); + Conn_Close(Idx, "Zip Write buffer overflow", NULL, false); return false; - + } return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len); } /* Zip_Buffer */ @@ -112,6 +116,7 @@ Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len ) /** * Compress data in ZIP buffer and move result to the write buffer of * the connection. + * This function closes the connection on error. * @param Idx Connection handle. * @return true on success, false otherwise. */ @@ -180,6 +185,7 @@ Zip_Flush( CONN_ID Idx ) * uncompress data and copy it to read buffer. * Returns true if data has been unpacked or no * compressed data is currently pending in the zread buffer. + * This function closes the connection on error. * @param Idx Connection handle. * @return true on success, false otherwise. */ @@ -230,9 +236,11 @@ Unzip_Buffer( CONN_ID Idx ) #endif assert(unzipbuf_used <= READBUFFER_LEN); if (!array_catb(&My_Connections[Idx].rbuf, (char*) unzipbuf, - (size_t)unzipbuf_used)) + (size_t)unzipbuf_used)) { + Log (LOG_ALERT, "Decompression error: can't copy data!?"); + Conn_Close(Idx, "Decompression error!", NULL, false); return false; - + } if( in->avail_in > 0 ) { array_moveleft(&My_Connections[Idx].zip.rbuf, 1, in_len ); } else {

1 0

Florian Westphal : client.c: remove unecessary comments
by fw＠arthur.barton.de 21 Apr '09

21 Apr '09

Module: ngircd.git Branch: master Commit: 5e16b6df2dbe7a953bf6c29f270221163cd517c1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5e16b6df… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Apr 20 08:34:09 2009 +0200 client.c: remove unecessary comments --- src/ngircd/client.c | 100 ++++++++++++++++++++------------------------------- 1 files changed, 39 insertions(+), 61 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 076a0cb..5ad4122 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -49,7 +49,6 @@ static CLIENT *This_Server, *My_Clients; -static char GetID_Buffer[GETID_LEN]; static WHOWAS My_Whowas[MAX_WHOWAS]; static int Last_Whowas = -1; @@ -305,8 +304,6 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen GLOBAL void Client_SetHostname( CLIENT *Client, const char *Hostname ) { - /* Hostname eines Clients setzen */ - assert( Client != NULL ); assert( Hostname != NULL ); @@ -317,8 +314,6 @@ Client_SetHostname( CLIENT *Client, const char *Hostname ) GLOBAL void Client_SetID( CLIENT *Client, const char *ID ) { - /* Hostname eines Clients setzen, Hash-Wert berechnen */ - assert( Client != NULL ); assert( ID != NULL ); @@ -332,16 +327,16 @@ Client_SetID( CLIENT *Client, const char *ID ) GLOBAL void Client_SetUser( CLIENT *Client, const char *User, bool Idented ) { - /* Username eines Clients setzen */ + /* set clients username */ assert( Client != NULL ); assert( User != NULL ); - if( Idented ) strlcpy( Client->user, User, sizeof( Client->user )); - else - { + if (Idented) { + strlcpy(Client->user, User, sizeof(Client->user)); + } else { Client->user[0] = '~'; - strlcpy( Client->user + 1, User, sizeof( Client->user ) - 1 ); + strlcpy(Client->user + 1, User, sizeof(Client->user) - 1); } } /* Client_SetUser */ @@ -349,48 +344,44 @@ Client_SetUser( CLIENT *Client, const char *User, bool Idented ) GLOBAL void Client_SetInfo( CLIENT *Client, const char *Info ) { - /* Hostname eines Clients setzen */ + /* set client hostname */ assert( Client != NULL ); assert( Info != NULL ); - strlcpy( Client->info, Info, sizeof( Client->info )); + strlcpy(Client->info, Info, sizeof(Client->info)); } /* Client_SetInfo */ GLOBAL void Client_SetModes( CLIENT *Client, const char *Modes ) { - /* Modes eines Clients setzen */ - assert( Client != NULL ); assert( Modes != NULL ); - strlcpy( Client->modes, Modes, sizeof( Client->modes )); + strlcpy(Client->modes, Modes, sizeof( Client->modes )); } /* Client_SetModes */ GLOBAL void Client_SetFlags( CLIENT *Client, const char *Flags ) { - /* Flags eines Clients setzen */ - assert( Client != NULL ); assert( Flags != NULL ); - strlcpy( Client->flags, Flags, sizeof( Client->flags )); + strlcpy(Client->flags, Flags, sizeof(Client->flags)); } /* Client_SetFlags */ GLOBAL void Client_SetPassword( CLIENT *Client, const char *Pwd ) { - /* Von einem Client geliefertes Passwort */ + /* set password sent by client */ assert( Client != NULL ); assert( Pwd != NULL ); - strlcpy( Client->pwd, Pwd, sizeof( Client->pwd )); + strlcpy(Client->pwd, Pwd, sizeof(Client->pwd)); } /* Client_SetPassword */ @@ -464,9 +455,7 @@ Client_ModeAdd( CLIENT *Client, char Mode ) assert( Client != NULL ); x[0] = Mode; x[1] = '\0'; - if( ! strchr( Client->modes, x[0] )) - { - /* Client hat den Mode noch nicht -> setzen */ + if (!strchr( Client->modes, x[0])) { strlcat( Client->modes, x, sizeof( Client->modes )); return true; } @@ -519,16 +508,12 @@ Client_Search( const char *Nick ) ptr = strchr( search_id, '!' ); if( ptr ) *ptr = '\0'; - search_hash = Hash( search_id ); + search_hash = Hash(search_id); c = My_Clients; - while( c ) - { - if( c->hash == search_hash ) - { - /* lt. Hash-Wert: Treffer! */ - if( strcasecmp( c->id, search_id ) == 0 ) return c; - } + while (c) { + if (c->hash == search_hash && strcasecmp(c->id, search_id) == 0) + return c; c = (CLIENT *)c->next; } return NULL; @@ -548,9 +533,10 @@ Client_GetFromToken( CLIENT *Client, int Token ) assert( Token > 0 ); c = My_Clients; - while( c ) - { - if(( c->type == CLIENT_SERVER ) && ( c->introducer == Client ) && ( c->token == Token )) return c; + while (c) { + if ((c->type == CLIENT_SERVER) && (c->introducer == Client) && + (c->token == Token)) + return c; c = (CLIENT *)c->next; } return NULL; @@ -683,17 +669,20 @@ Client_NextHop( CLIENT *Client ) } /* Client_NextHop */ +/** + * return Client-ID ("client!user@host"), this ID is needed for e.g. + * prefixes. Returnes pointer to static buffer. + */ GLOBAL char * Client_Mask( CLIENT *Client ) { - /* Client-"ID" liefern, wie sie z.B. fuer - * Prefixe benoetigt wird. */ + static char GetID_Buffer[GETID_LEN]; assert( Client != NULL ); if( Client->type == CLIENT_SERVER ) return Client->id; - snprintf( GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host ); + snprintf(GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host); return GetID_Buffer; } /* Client_Mask */ @@ -725,8 +714,6 @@ Client_HasMode( CLIENT *Client, char Mode ) GLOBAL char * Client_Away( CLIENT *Client ) { - /* AWAY-Text liefern */ - assert( Client != NULL ); return Client->away; } /* Client_Away */ @@ -738,7 +725,7 @@ Client_CheckNick( CLIENT *Client, char *Nick ) assert( Client != NULL ); assert( Nick != NULL ); - if( ! Client_IsValidNick( Nick )) + if (! Client_IsValidNick( Nick )) { IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick ); return false; @@ -759,8 +746,6 @@ Client_CheckNick( CLIENT *Client, char *Nick ) GLOBAL bool Client_CheckID( CLIENT *Client, char *ID ) { - /* Nick ueberpruefen */ - char str[COMMAND_LEN]; CLIENT *c; @@ -768,24 +753,22 @@ Client_CheckID( CLIENT *Client, char *ID ) assert( Client->conn_id > NONE ); assert( ID != NULL ); - /* Nick zu lang? */ - if( strlen( ID ) > CLIENT_ID_LEN ) - { - IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), ID ); + /* Nick too long? */ + if (strlen(ID) > CLIENT_ID_LEN) { + IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID(Client), ID); return false; } - /* ID bereits vergeben? */ + /* does ID already exist? */ c = My_Clients; - while( c ) - { - if( strcasecmp( c->id, ID ) == 0 ) - { - /* die Server-ID gibt es bereits */ - snprintf( str, sizeof( str ), "ID \"%s\" already registered", ID ); - if( Client->conn_id != c->conn_id ) Log( LOG_ERR, "%s (on connection %d)!", str, c->conn_id ); - else Log( LOG_ERR, "%s (via network)!", str ); - Conn_Close( Client->conn_id, str, str, true); + while (c) { + if (strcasecmp(c->id, ID) == 0) { + snprintf(str, sizeof(str), "ID \"%s\" already registered", ID); + if (Client->conn_id != c->conn_id) + Log(LOG_ERR, "%s (on connection %d)!", str, c->conn_id); + else + Log(LOG_ERR, "%s (via network)!", str); + Conn_Close(Client->conn_id, str, str, true); return false; } c = (CLIENT *)c->next; @@ -798,8 +781,6 @@ Client_CheckID( CLIENT *Client, char *ID ) GLOBAL CLIENT * Client_First( void ) { - /* Ersten Client liefern. */ - return My_Clients; } /* Client_First */ @@ -807,9 +788,6 @@ Client_First( void ) GLOBAL CLIENT * Client_Next( CLIENT *c ) { - /* Naechsten Client liefern. Existiert keiner, - * so wird NULL geliefert. */ - assert( c != NULL ); return (CLIENT *)c->next; } /* Client_Next */

1 0

Florian Westphal : add const qualifier to pointers where possible
by fw＠arthur.barton.de 21 Apr '09

21 Apr '09

Module: ngircd.git Branch: master Commit: ea041b8838714707dca4500f63e2b40344b506c2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ea041b88… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Apr 12 01:09:42 2009 +0200 add const qualifier to pointers where possible --- src/ngircd/channel.c | 8 ++++---- src/ngircd/channel.h | 8 ++++---- src/ngircd/client.c | 45 +++++++++++++++++++++++---------------------- src/ngircd/client.h | 24 ++++++++++++------------ src/ngircd/conf.c | 8 ++++---- src/ngircd/conf.h | 8 ++++---- src/ngircd/conn-zip.c | 2 +- src/ngircd/conn-zip.h | 2 +- src/ngircd/conn.c | 4 ++-- src/ngircd/conn.h | 2 +- 10 files changed, 56 insertions(+), 55 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=ea04…

1 0

Tag rel-14: Alexander Barton : ngIRCd release 14
by alex＠arthur.barton.de 20 Apr '09

20 Apr '09

Module: ngircd.git Branch: refs/tags/rel-14 Tag: ccbcedf25b77e4420044c15113aead7faf8148d0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=ccbcedf25b7… Tagger: Alexander Barton <alex(a)barton.de> Date: Mon Apr 20 11:39:40 2009 +0200 ngIRCd release 14

1 0

Alexander Barton : ngIRCd release 14
by alex＠arthur.barton.de 20 Apr '09

20 Apr '09

Module: ngircd.git Branch: master Commit: 68835a1d1acb36a5e38870a83a261a969b1878e4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=68835a1d… Author: Alexander Barton <alex(a)barton.de> Date: Mon Apr 20 11:36:27 2009 +0200 ngIRCd release 14 --- ChangeLog | 4 +++- NEWS | 2 +- configure.in | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44bb198..c5bc401 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,9 @@ -- ChangeLog -- -ngIRCd Release 14 +ngIRCd Release 14 (2009-04-20) + + - Display IPv6 addresses as "[<addr>]" when accepting connections. ngIRCd 14~rc1 (2009-03-29) - Updated Debian/Linux init script (see contrib/Debian/ngircd.init). diff --git a/NEWS b/NEWS index 81ca8cc..e92a57c 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ -- NEWS -- -ngIRCd Release 14 +ngIRCd Release 14 (2009-04-20) ngIRCd 14~rc1 (2009-03-29) - Allow creation of persistent modeless channels. diff --git a/configure.in b/configure.in index 98d9ac7..221875d 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 14~rc1) +AC_INIT(ngircd, 14) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 2efb45d..9999779 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (14-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 14. + + -- Alexander Barton <alex(a)barton.de> Mon, 20 Apr 2009 11:09:12 +0200 + ngircd (14~rc1-0ab1) unstable; urgency=low * New "upstream" release candidate 1 for ngIRCd Release 14. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 5800637..dcd2650 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 14~rc1 +%define version 14 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Display IPv6 addresses as "[<addr>]" when accepting connections.
by alex＠arthur.barton.de 10 Apr '09

10 Apr '09

Module: ngircd.git Branch: master Commit: 54879b432b99bb22df905b8e22c3f83205ea8d60 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=54879b43… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 10 13:22:03 2009 +0200 Display IPv6 addresses as "[<addr>]" when accepting connections. With this patch ngIRCd displays IPv6 addresses as "[<addr>]:<port>" when accepting new connections and later, if no successful DNS lookup could be made (or DNS is disabled altogether). --- src/ngircd/conn.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index bd1a5bd..5b52511 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1261,14 +1261,21 @@ New_Connection( int Sock ) My_Connections[new_sock].addr = new_addr; My_Connections[new_sock].client = c; - Log( LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", new_sock, - ip_str, ng_ipaddr_getport(&new_addr), Sock); - - /* Hostnamen ermitteln */ - strlcpy(My_Connections[new_sock].host, ip_str, sizeof(My_Connections[new_sock].host)); + /* Set initial hostname to IP address. This becomes overwritten when + * the DNS lookup is enabled and succeeds, but is used otherwise. */ + if (ng_ipaddr_af(&new_addr) != AF_INET) + snprintf(My_Connections[new_sock].host, + sizeof(My_Connections[new_sock].host), "[%s]", ip_str); + else + strlcpy(My_Connections[new_sock].host, ip_str, + sizeof(My_Connections[new_sock].host)); Client_SetHostname(c, My_Connections[new_sock].host); + Log(LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", + new_sock, My_Connections[new_sock].host, + ng_ipaddr_getport(&new_addr), Sock); + identsock = new_sock; #ifdef IDENTAUTH if (Conf_NoIdent)

1 0

Alexander Barton : Xcode: #define include __DATE__ in VERSION
by alex＠arthur.barton.de 10 Apr '09

10 Apr '09

Module: ngircd.git Branch: master Commit: d9355d53f8c9b6ed81e8df61f52cb8506b077d05 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d9355d53… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 10 13:08:04 2009 +0200 Xcode: #define include __DATE__ in VERSION Change VERSION to include the __DATE__ when compiling from within Xcode. When building using "make xcode" or "make osxpkg" VERSION already is defined to the "real" version number set in configure.in. --- contrib/MacOSX/config.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 5ed07d9..60b0618 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -13,7 +13,7 @@ #define PACKAGE_NAME "ngircd" #ifndef VERSION -#define VERSION "??" +#define VERSION "??("__DATE__")" #endif #define SYSCONFDIR "/etc/ngircd"

1 0

Alexander Barton : Fix ChangeLog: Local channels are already implemented in Release 13
by alex＠arthur.barton.de 09 Apr '09

09 Apr '09

Module: ngircd.git Branch: master Commit: 8c0137a6e07a70340c54fc25717797591bbe697b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8c0137a6… Author: Alexander Barton <alex(a)barton.de> Date: Thu Apr 9 15:17:44 2009 +0200 Fix ChangeLog: Local channels are already implemented in Release 13 --- ChangeLog | 2 -- NEWS | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6acd2f..44bb198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,8 +25,6 @@ ngIRCd Release 14 - Remove limit on maximum number of predefined channels in ngircd.conf. - Updated ngircd.spec file for building RPM packages. - Add new and missing files to Mac OS X Xcode project, and update project. - - Implement pre-defined server local channels ("&") and write some - server-specific messages to &SERVER. - Reject masks with wildcard after last dot. - TLS/SSL: remove useless error message when ssl connection is closed. - Fix memory leak when a encrypted and compressed server link goes down. diff --git a/NEWS b/NEWS index 27276cf..81ca8cc 100644 --- a/NEWS +++ b/NEWS @@ -20,8 +20,6 @@ ngIRCd Release 14 here a file can be configured for each pre-defined channel which contains individual channel keys for different users. - Remove limit on maximum number of predefined channels in ngircd.conf. - - Implement pre-defined server local channels ("&") and write some - server-specific messages to &SERVER. ngIRCd Release 13 (2008-12-25)

1 0

Alexander Barton : Fix up last Debian changelog entry
by alex＠arthur.barton.de 30 Mär '09

30 Mär '09

Module: ngircd.git Branch: master Commit: 166ab3925e8f3960cc761201a8fd96a026bf317c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=166ab392… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 30 13:44:04 2009 +0200 Fix up last Debian changelog entry --- contrib/Debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 1e88c6a..2efb45d 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,6 +1,6 @@ -ngircd (14~rc1-0ab1 unstable; urgency=low +ngircd (14~rc1-0ab1) unstable; urgency=low - * New "upstream" release candidate for 1 for ngIRCd Release 14. + * New "upstream" release candidate 1 for ngIRCd Release 14. -- Alexander Barton <alex(a)barton.de> Sun, 29 Mar 2009 17:09:17 +0200

1 0

Tag rel-14-rc1: Alexander Barton : ngIRCd release 14~rc1
by alex＠arthur.barton.de 29 Mär '09

29 Mär '09

Module: ngircd.git Branch: refs/tags/rel-14-rc1 Tag: 3049bd4dca90a976ed1ea3e9834683f4e765b194 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=3049bd4dca9… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun Mar 29 17:24:36 2009 +0200 ngIRCd release 14~rc1

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