März 2009 - ngIRCd GIT Updates

Florian Westphal : allow creation of persistent modeless channels
by fw＠arthur.barton.de 07 Mär '09

07 Mär '09

Module: ngircd.git Branch: master Commit: 2d4361d088f75bdcbc0deced824e2b3aafbb8fa0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2d4361d0… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Mar 7 00:21:43 2009 +0100 allow creation of persistent modeless channels --- src/ngircd/conf.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 4a8b628..71f5760 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -40,6 +40,7 @@ #include "ngircd.h" #include "conn.h" #include "client.h" +#include "channel.h" #include "defines.h" #include "log.h" #include "match.h" @@ -1169,10 +1170,11 @@ Handle_Channelname(struct Conf_Channel *new_chan, const char *name) size_t size = sizeof(new_chan->name); char *dest = new_chan->name; - /* Channels names must begin with "&" or "#", if it is - * missing, add a '#'. This is only here for user convenience. - */ - if (*name && *name != '#' && *name != '&') { + if (!Channel_IsValidName(name)) { + /* + * maybe user forgot to add a '#'. + * This is only here for user convenience. + */ *dest = '#'; --size; ++dest;

1 0

Florian Westphal : add and use Channel_IsModeless()
by fw＠arthur.barton.de 07 Mär '09

07 Mär '09

Module: ngircd.git Branch: master Commit: e9e7fc33f15d7ead5f547ebdfcc7836b75f54f83 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e9e7fc33… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Mar 7 00:13:25 2009 +0100 add and use Channel_IsModeless() avoid "name[0] == '+'" where possible, having Channel_IsModeless() makes things much more obvious. --- src/ngircd/channel.h | 2 +- src/ngircd/irc-channel.c | 2 +- src/ngircd/irc-mode.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index 411c345..b41cced 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -132,7 +132,7 @@ GLOBAL bool Channel_CheckKey PARAMS((CHANNEL *Chan, CLIENT *Client, const char *Key)); #define Channel_IsLocal(c) (Channel_Name(c)[0] == '&') - +#define Channel_IsModeless(c) (Channel_Name(c)[0] == '+') #endif diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 6c478c8..af0f066 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -303,7 +303,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) if (!chan) { /* channel is new; it has been created above */ chan = Channel_Search(channame); assert(chan != NULL); - if (*channame == '+') { /* modeless channel... */ + if (Channel_IsModeless(chan)) { Channel_ModeAdd(chan, 't'); /* /TOPIC not allowed */ Channel_ModeAdd(chan, 'n'); /* no external msgs */ } diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 9ada4f1..ba28f83 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -290,8 +290,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) long l; size_t len; - /* Are modes allowed on channel? */ - if (Channel_Name(Channel)[0] == '+') + if (Channel_IsModeless(Channel)) return IRC_WriteStrClient(Client, ERR_NOCHANMODES_MSG, Client_ID(Client), Channel_Name(Channel));

1 0

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