- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Enhance INFO command to report compile time, if available
by alex＠arthur.barton.de 05 Mär '09

05 Mär '09

Module: ngircd.git Branch: master Commit: c09742c5189802103900fc84ded42f4f84f27ae9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c09742c5… Author: Alexander Barton <alex(a)barton.de> Date: Thu Mar 5 16:04:36 2009 +0100 Enhance INFO command to report compile time, if available --- ChangeLog | 1 + src/ngircd/irc-info.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38fb7f2..e0d1365 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ ngIRCd Release 14~rc1 + - The INFO command reports the compile time now (if available). - Spell check and enhance ngIRCd manual pages. - Channel mode changes: break on syntax errors in MODE command. - Support individual channel keys for pre-defined channels: introduce diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 4ac2a47..e934521 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -133,8 +133,14 @@ IRC_INFO(CLIENT * Client, REQUEST * Req) if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), NGIRCd_Version)) return DISCONNECTED; - - strlcpy(msg, "Server has been started ", sizeof(msg)); + +#if defined(__DATE__) && defined(__TIME__) + snprintf(msg, sizeof(msg), "Birth Date: %s at %s", __DATE__, __TIME__); + if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg)) + return DISCONNECTED; +#endif + + strlcpy(msg, "On-line since ", sizeof(msg)); strlcat(msg, NGIRCd_StartStr, sizeof(msg)); if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg)) return DISCONNECTED;

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 03 Mär '09

03 Mär '09

Module: ngircd.git Branch: master Commit: c56ab962706c7b60ab649d77f317cd5086fad368 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c56ab962… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 3 17:59:43 2009 +0100 Update NEWS and ChangeLog files --- ChangeLog | 25 ++++++++++++++++++++----- NEWS | 12 +++++++++++- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cc268a..38fb7f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2008 Alexander Barton, + (c)2001-2009 Alexander Barton, alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -9,12 +9,27 @@ -- ChangeLog -- -ngIRCd-dev +ngIRCd Release 14~rc1 + + - Spell check and enhance ngIRCd manual pages. + - Channel mode changes: break on syntax errors in MODE command. + - Support individual channel keys for pre-defined channels: introduce + new configuration variable "KeyFile" in [Channel] sections in ngircd.conf, + 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. + - 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. - (Bug #95, reported by Christoph, fiesh(a)fiesh.homeip.net) - - Fix handling of channels containing dots (Bug #93, reported by - gonosz csiga) + (closes bug #95, reported by Christoph, fiesh(a)fiesh.homeip.net) + - Fix handling of channels containing dots. + (closes ug #93, reported by Gonosz Csiga) + ngIRCd Release 13 (2008-12-25) - Updated documentation, especially doc/Services.txt and doc/SSL.txt. diff --git a/NEWS b/NEWS index 869b1d6..4e1fa0d 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2008 Alexander Barton, + (c)2001-2009 Alexander Barton, alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -10,6 +10,16 @@ -- NEWS -- +ngIRCd Release 14~rc1 + + - Support individual channel keys for pre-defined channels: introduce + new configuration variable "KeyFile" in [Channel] sections in ngircd.conf, + 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) ngIRCd 13~rc1 (2008-11-21):

1 0

Alexander Barton : Channel mode changes: break on error
by alex＠arthur.barton.de 03 Mär '09

03 Mär '09

Module: ngircd.git Branch: master Commit: 0a9608a26f4c5fec7d09f13a814bf4e384b17759 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0a9608a2… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 3 16:33:40 2009 +0100 Channel mode changes: break on error Don't echo multiple syntax error messages (461) on invalid commands, but break after the first one. In addition, this solves corrupted 'Unknown mode "+' messages. --- src/ngircd/irc-mode.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 2c14228..9ada4f1 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -440,6 +440,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) ok = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); + goto chan_exit; } break; case 'l': /* Member limit */ @@ -475,6 +476,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) ok = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); + goto chan_exit; } break; case 'P': /* Persistent channel */ @@ -519,6 +521,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) ok = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); + goto chan_exit; } break; /* --- Channel lists --- */

1 0

Alexander Barton : Channel_Mode(): code cleanup (no functional changes)
by alex＠arthur.barton.de 03 Mär '09

03 Mär '09

Module: ngircd.git Branch: master Commit: dee89c2355f973db0ba7c7ca81c83940caefc3d4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dee89c23… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 3 15:06:34 2009 +0100 Channel_Mode(): code cleanup (no functional changes) --- src/ngircd/irc-mode.c | 176 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 124 insertions(+), 52 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=dee8…

1 0

Florian Westphal : TLS/SSL: remove useless error message when ssl connection is closed
by fw＠arthur.barton.de 05 Feb '09

05 Feb '09

Module: ngircd.git Branch: master Commit: b8c6dd503fe4e7814f4b9327a8cd43007a4ec150 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b8c6dd50… Author: Florian Westphal <fw(a)strlen.de> Date: Thu Feb 5 23:42:56 2009 +0100 TLS/SSL: remove useless error message when ssl connection is closed When using OpenSSL, the following annoying "error" message was logged whenever an encrypted connection was shut down in a orderly fashion: TLS/SSL Connection shutdown: ConnSSL_Read: Unable to determine error of course, this isn't an error at all. --- src/ngircd/conn-ssl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 1b4da3c..4ef8f66 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -484,8 +484,8 @@ ConnSSL_HandleError( CONNECTION *c, const int code, const char *fname ) Conn_OPTION_ADD(c, CONN_SSL_WANT_WRITE); /* fall through */ case SSL_ERROR_NONE: return 0; /* try again later */ - case SSL_ERROR_ZERO_RETURN: /* TLS/SSL Connection was shut down */ - LogOpenSSLError("TLS/SSL Connection shutdown", fname); + case SSL_ERROR_ZERO_RETURN: + LogDebug("TLS/SSL connection shut down normally"); break; /* SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT, SSL_ERROR_WANT_X509_LOOKUP

1 0

Florian Westphal : update ChangeLog.
by fw＠arthur.barton.de 04 Feb '09

04 Feb '09

Module: ngircd.git Branch: master Commit: 66d6c3c84b092c422b094bddeff3e04fd2488cfc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=66d6c3c8… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Feb 4 23:33:46 2009 +0100 update ChangeLog. --- ChangeLog | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e1fcc7..2cc268a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,12 @@ -- ChangeLog -- +ngIRCd-dev + - Fix memory leak when a encrypted and compressed server link goes down. + (Bug #95, reported by Christoph, fiesh(a)fiesh.homeip.net) + - Fix handling of channels containing dots (Bug #93, reported by + gonosz csiga) ngIRCd Release 13 (2008-12-25) - Updated documentation, especially doc/Services.txt and doc/SSL.txt.

1 0

Florian Westphal : SSL/TLS: clear all ssl realted flags on shutdown
by fw＠arthur.barton.de 04 Feb '09

04 Feb '09

Module: ngircd.git Branch: master Commit: 2fce4667a86e42589db8dd84a51c472aa18ac80e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2fce4667… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Feb 4 23:23:12 2009 +0100 SSL/TLS: clear all ssl realted flags on shutdown one ssl related flags was not cleared on ssl shutdown. introduce and use CONN_SSL_FLAGS_ALL to zap them all. --- src/ngircd/conn-ssl.c | 3 ++- src/ngircd/conn.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index dc165d7..1b4da3c 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -228,7 +228,8 @@ void ConnSSL_Free(CONNECTION *c) } #endif assert(Conn_OPTION_ISSET(c, CONN_SSL)); - Conn_OPTION_DEL(c, (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE)); + /* can't just set bitmask to 0 -- there are other, non-ssl related flags, e.g. CONN_ZIP. */ + Conn_OPTION_DEL(c, CONN_SSL_FLAGS_ALL); } diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index bd332b6..450d3d1 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -39,6 +39,7 @@ #define CONN_SSL 32 /* this connection is SSL encrypted */ #define CONN_SSL_WANT_WRITE 64 /* SSL/TLS library needs to write protocol data */ #define CONN_SSL_WANT_READ 128 /* SSL/TLS library needs to read protocol data */ +#define CONN_SSL_FLAGS_ALL (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ) #endif typedef int CONN_ID;

1 0

Florian Westphal : TLS/SSL: fix memory leak when using compressed server links with ssl
by fw＠arthur.barton.de 04 Feb '09

04 Feb '09

Module: ngircd.git Branch: master Commit: c6a43fbaf0579741ebf34e88ca7f0586b471062e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c6a43fba… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Feb 4 23:01:53 2009 +0100 TLS/SSL: fix memory leak when using compressed server links with ssl commit 6bc2d3d06e9cb4da68ea4b63d9b6b219d88ab927 (New connection option CONN_RFC1459) forgot to adjust the ssl bitmasks. The result is that when a compressed AND encrypted server link goes down the memory allocated by zlib and the r/w buffers are no longer free'd as the previous ConnSSL_Free() would then also remove the CONN_ZIP flag from the flag mask. --- src/ngircd/conn.h | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 08f6dde..bd332b6 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -18,7 +18,13 @@ #include <time.h> /* for time_t, see below */ - +/* + * connection state flags. this is a bitmask -- all values must + * be unique and a power of two. + * + * If you introduce new ones in between, make sure to adjust all + * remaining ones. + */ #define CONN_ISCLOSING 1 /* Conn_Close() already called */ #define CONN_ISCONNECTING 2 /* connect() in progress */ #define CONN_RFC1459 4 /* RFC 1459 compatibility mode */ @@ -29,10 +35,10 @@ #include "conf-ssl.h" #ifdef SSL_SUPPORT -#define CONN_SSL_CONNECT 8 /* wait for ssl connect to finish */ -#define CONN_SSL 16 /* this connection is SSL encrypted */ -#define CONN_SSL_WANT_WRITE 32 /* SSL/TLS library needs to write protocol data */ -#define CONN_SSL_WANT_READ 64 /* SSL/TLS library needs to read protocol data */ +#define CONN_SSL_CONNECT 16 /* wait for ssl connect to finish */ +#define CONN_SSL 32 /* this connection is SSL encrypted */ +#define CONN_SSL_WANT_WRITE 64 /* SSL/TLS library needs to write protocol data */ +#define CONN_SSL_WANT_READ 128 /* SSL/TLS library needs to read protocol data */ #endif typedef int CONN_ID;

1 0

Alexander Barton : Fix spelling of log message: "channek" vs. "channel" ...
by alex＠arthur.barton.de 21 Jan '09

21 Jan '09

Module: ngircd.git Branch: master Commit: 3be9c477be674228c86378e017a70bf49acf06a4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3be9c477… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 9 20:18:23 2009 +0100 Fix spelling of log message: "channek" vs. "channel" ... --- src/ngircd/channel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 8408ccb..0a1ba45 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1080,7 +1080,7 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) return false; fd = fopen(file_name, "r"); if (!fd) { - Log(LOG_ERR, "Can't open channek key file \"%s\" for %s: %s", + Log(LOG_ERR, "Can't open channel key file \"%s\" for %s: %s", file_name, Chan->name, strerror(errno)); return false; }

1 0

Alexander Barton : Channel key file: store file name and open on each access.
by alex＠arthur.barton.de 21 Jan '09

21 Jan '09

Module: ngircd.git Branch: master Commit: d09094812f5a8998e779fd75d265396486878117 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d0909481… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 4 17:26:50 2009 +0100 Channel key file: store file name and open on each access. Store the file name of channel key files and reopen them on each access (on each JOIN command) insted of just storing the file handles. This eliminates the special requirements (no delete) and makes sure that always the actual file contents are used in all circumstances. --- src/ngircd/channel.c | 75 ++++++++++++++++++++++++++----------------------- src/ngircd/channel.h | 2 +- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 6d23b24..8408ccb 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -61,9 +61,7 @@ static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan )); static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan )); static void Delete_Channel PARAMS(( CHANNEL *Chan )); static void Free_Channel PARAMS(( CHANNEL *Chan )); -static void Update_Predefined PARAMS((CHANNEL *Chan, - const struct Conf_Channel *Conf_Chan)); -static void Set_Key_File PARAMS((CHANNEL *Chan, FILE *KeyFile)); +static void Set_KeyFile PARAMS((CHANNEL *Chan, const char *KeyFile)); GLOBAL void @@ -124,7 +122,7 @@ Channel_InitPredefined( void ) Log(LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.", conf_chan->name); - Update_Predefined(new_chan, conf_chan); + Set_KeyFile(new_chan, conf_chan->keyfile); continue; } @@ -148,7 +146,7 @@ Channel_InitPredefined( void ) Channel_SetKey(new_chan, conf_chan->key); Channel_SetMaxUsers(new_chan, conf_chan->maxusers); - Update_Predefined(new_chan, conf_chan); + Set_KeyFile(new_chan, conf_chan->keyfile); } if (channel_count) array_free(&Conf_Channels); @@ -159,10 +157,9 @@ static void Free_Channel(CHANNEL *chan) { array_free(&chan->topic); + array_free(&chan->keyfile); Lists_Free(&chan->list_bans); Lists_Free(&chan->list_invites); - if (Chan->keyfile) - fclose(Chan->keyfile); free(chan); } @@ -1064,7 +1061,8 @@ Channel_LogServer(char *msg) GLOBAL bool Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) { - char line[COMMAND_LEN], *nick, *pass; + char *file_name, line[COMMAND_LEN], *nick, *pass; + FILE *fd; assert(Chan != NULL); assert(Client != NULL); @@ -1074,11 +1072,20 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) return true; if (strcmp(Chan->key, Key) == 0) return true; - if (!Chan->keyfile) + if (*Key == '\0') + return false; + + file_name = array_start(&Chan->keyfile); + if (!file_name) return false; + fd = fopen(file_name, "r"); + if (!fd) { + Log(LOG_ERR, "Can't open channek key file \"%s\" for %s: %s", + file_name, Chan->name, strerror(errno)); + return false; + } - Chan->keyfile = freopen(NULL, "r", Chan->keyfile); - while (fgets(line, sizeof(line), Chan->keyfile) != NULL) { + while (fgets(line, sizeof(line), fd) != NULL) { ngt_TrimStr(line); if (! (nick = strchr(line, ':'))) continue; @@ -1093,8 +1100,10 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) if (strcmp(Key, pass) != 0) continue; + fclose(fd); return true; } + fclose(fd); return false; } /* Channel_CheckKey */ @@ -1157,35 +1166,31 @@ Delete_Channel(CHANNEL *Chan) static void -Update_Predefined(CHANNEL *Chan, const struct Conf_Channel *Conf_Chan) +Set_KeyFile(CHANNEL *Chan, const char *KeyFile) { - FILE *fd; - - if (! Conf_Chan->keyfile || ! *Conf_Chan->keyfile) - return; + size_t len; - fd = fopen(Conf_Chan->keyfile, "r"); - if (! fd) - Log(LOG_ERR, - "Can't open channel key file for \"%s\", \"%s\": %s", - Conf_Chan->name, Conf_Chan->keyfile, - strerror(errno)); - else - Set_Key_File(Chan, fd); -} /* Update_Predefined */ + assert(Chan != NULL); + assert(KeyFile != NULL); + len = strlen(KeyFile); + if (len < array_bytes(&Chan->keyfile)) { + Log(LOG_INFO, "Channel key file of %s removed.", Chan->name); + array_free(&Chan->keyfile); + } -static void -Set_Key_File(CHANNEL *Chan, FILE *KeyFile) -{ - assert(Chan != NULL); + if (len < 1) + return; - if (Chan->keyfile) - fclose(Chan->keyfile); - Chan->keyfile = KeyFile; - Log(LOG_INFO|LOG_snotice, - "New local channel key file for \"%s\" activated.", Chan->name); -} /* Set_Key_File */ + if (!array_copyb(&Chan->keyfile, KeyFile, len+1)) + Log(LOG_WARNING, + "Could not set new channel key file \"%s\" for %s: %s", + KeyFile, Chan->name, strerror(errno)); + else + Log(LOG_INFO|LOG_snotice, + "New local channel key file \"%s\" for %s activated.", + KeyFile, Chan->name); +} /* Set_KeyFile */ /* -eof- */ diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index 3aa1853..411c345 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -37,7 +37,7 @@ typedef struct _CHANNEL unsigned long maxusers; /* Maximum number of members (mode "l") */ struct list_head list_bans; /* list head of banned users */ struct list_head list_invites; /* list head of invited users */ - FILE *keyfile; /* handle of the channel key file */ + array keyfile; /* Name of the channel key file */ } CHANNEL; typedef struct _CLIENT2CHAN

1 0