- ngIRCd GIT Updates - lists.barton.de

Florian Westphal : conf: add missing static qualifier
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 9402bcaa73a9365f861108f1b53eec1c09837eef URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9402bcaa… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 17:54:21 2011 +0100 conf: add missing static qualifier internal helper, so it should be static. also, add UNUSED to 'Line'. --- src/ngircd/conf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index b194d3a..db52869 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -893,7 +893,7 @@ Handle_MaxNickLength(int Line, const char *Arg) static void -WarnIdent(int Line) +WarnIdent(int UNUSED Line) { #ifndef IDENTAUTH if (Conf_Ident) { @@ -927,7 +927,7 @@ CheckLegacyNoOption(const char *Var, const char *Arg) return false; } -const char * +static const char * NoNo(const char *str) { assert(strncasecmp("no", str, 2) == 0 && str[2]);

1 0

Alexander Barton : Update copyright notices for 2010 :)
by alex＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 6d11fb149707194e986b0d64af3d44f21e158fcc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6d11fb14… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 9 16:11:12 2011 +0100 Update copyright notices for 2010 :) And update the NEWS and ChangeLog file as well. --- AUTHORS | 5 ++--- ChangeLog | 18 +++++++++++++++--- INSTALL | 5 ++--- NEWS | 14 +++++++++++--- README | 5 ++--- src/ngircd/ngircd.c | 4 ++-- 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/AUTHORS b/AUTHORS index e0e1d07..03a19dd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2009 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/ChangeLog b/ChangeLog index 93206ef..03090b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,27 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. -- ChangeLog -- +ngIRCd + + - Make [No]ZeroConf configuration option work with Howl. + - Deprecate NoXX-Options in ngircd.conf: 'NoDNS=no' => 'DNS=yes', + 'NoIdent=no' => 'Ident=yes', 'NoPAM=no' => 'PAM=yes', and + 'NoZeroConf=no' => 'ZeroConf=yes' (and vice-versa). + The defaults are adjusted accordingly and the old variables are still + accepted, so there is no functional change. + - Fix confusing "adding to invite list" debug messages. + - Don't throttle services and servers beeing registered. + - Xcode: correctly sort files + - Don't assert() when serching a client for an invalid server token. + ngIRCd Release 17.1 (2010-12-19) - --configtest: remember if MOTD is configured by file or phrase diff --git a/INSTALL b/INSTALL index f7e51a1..ce43e35 100644 --- a/INSTALL +++ b/INSTALL @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 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 9524e8b..0d6ef8a 100644 --- a/NEWS +++ b/NEWS @@ -1,15 +1,23 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. -- NEWS -- +ngIRCd + + - Deprecate NoXX-Options in ngircd.conf: 'NoDNS=no' => 'DNS=yes', + 'NoIdent=no' => 'Ident=yes', 'NoPAM=no' => 'PAM=yes', and + 'NoZeroConf=no' => 'ZeroConf=yes' (and vice-versa). + The defaults are adjusted accordingly and the old variables are still + accepted, so there is no functional change. + - Don't throttle services and servers beeing registered. + ngIRCd Release 17.1 (2010-12-19) - Don't log critical (or worse) messages to stderr diff --git a/README b/README index 1feedfe..3c39cad 100644 --- a/README +++ b/README @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2007 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 6dfd206..63fc64b 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 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 @@ -432,7 +432,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2010 Alexander Barton (<alex(a)barton.de>) and Contributors." ); + puts( "Copyright (c)2001-2011 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 : Make NoZeroConf option work with Howl
by alex＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 28bbd7e27a44ff3c03f86aa6f17a578ad15ee498 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=28bbd7e2… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 9 14:31:18 2011 +0100 Make NoZeroConf option work with Howl --- src/ngircd/rendezvous.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/ngircd/rendezvous.c b/src/ngircd/rendezvous.c index 056cb1e..6727893 100644 --- a/src/ngircd/rendezvous.c +++ b/src/ngircd/rendezvous.c @@ -107,6 +107,12 @@ GLOBAL void Rendezvous_Init( void ) int i; + for (i = 0; i < MAX_RENDEZVOUS; i++) + My_Rendezvous[i].Desc[0] = '\0'; + + if (!Conf_ZeroConf) + return; + #ifdef HOWL if( sw_discovery_init( &My_Discovery_Session ) != SW_OKAY ) { @@ -122,8 +128,6 @@ GLOBAL void Rendezvous_Init( void ) exit( 1 ); } #endif - - for( i = 0; i < MAX_RENDEZVOUS; i++ ) My_Rendezvous[i].Desc[0] = '\0'; } /* Rendezvous_Init */ @@ -238,6 +242,9 @@ GLOBAL void Rendezvous_Handler( void ) /* Handle all Rendezvous stuff; this function must be called * periodically from the run loop of the main program */ + if (!Conf_ZeroConf) + return; + #ifdef APPLE int i; char buffer[MAX_MACH_MSG_SIZE];

1 0

Florian Westphal : config: deprecate NoXX-Options
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 1dca082fc6f0595d6bde431bf50132445340fb7f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1dca082f… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Jan 8 15:56:14 2011 +0100 config: deprecate NoXX-Options ngircd unfortunately uses several options using double-negation, e.g. NoIdent = No, NoPam = No, etc. This renames all options by dropping the "No" prefix, e.g. "NoIdent = no" becomes "Ident = yes". The old options will continue to work, but will cause a warning message. Also update man pages and default config. To prevent silly 'Ident = yes' from appearing in --configtest output in the 'ident support not compiled in and Ident Option not used' case, make default value depend on feature availability. If feature is available, enable by default, otherwise disable. We might consider moving these options to a new [Feature] section, or something like that, because none of these options are essential. Another possible improvement: 'Ident = yes' option in ngircd.conf causes a warning if ngircd was built without ident support. This does not happen with e.g. zeroconf.... --- doc/sample-ngircd.conf.tmpl | 17 +++--- man/ngircd.conf.5.tmpl | 18 +++--- src/ngircd/client.c | 2 +- src/ngircd/conf.c | 124 +++++++++++++++++++++++++++++++++---------- src/ngircd/conf.h | 16 +++--- src/ngircd/conn.c | 4 +- src/ngircd/irc-login.c | 2 +- src/ngircd/rendezvous.c | 2 +- 8 files changed, 126 insertions(+), 59 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=1dca…

1 0

Florian Westphal : channel: fix confusing "adding to invite list" debug output
by fw＠arthur.barton.de 31 Dez '10

31 Dez '10

Module: ngircd.git Branch: master Commit: 4a5dfcc3ace54de033f16503065831ed62433b2d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a5dfcc3… Author: Florian Westphal <fw(a)strlen.de> Date: Fri Dec 31 11:32:20 2010 +0100 channel: fix confusing "adding to invite list" debug output adding entries to ban list produced 'invite list' debug output... --- src/ngircd/channel.c | 2 ++ src/ngircd/lists.c | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index edbbc38..e49e5a9 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -989,6 +989,7 @@ GLOBAL bool Channel_AddBan(CHANNEL *c, const char *mask ) { struct list_head *h = Channel_GetListBans(c); + LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "ban"); return Lists_Add(h, mask, false); } @@ -997,6 +998,7 @@ GLOBAL bool Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce) { struct list_head *h = Channel_GetListInvites(c); + LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "invite"); return Lists_Add(h, mask, onlyonce); } diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 363c62d..58c5d16 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -85,7 +85,6 @@ Lists_Add(struct list_head *header, const char *Mask, bool OnlyOnce ) newelem->next = e; header->first = newelem; - LogDebug("Added \"%s\" to invite list", Mask); return true; }

1 0

Alexander Barton : Command throttling: introduce MAX_COMMANDS_SERVICE
by alex＠arthur.barton.de 29 Dez '10

29 Dez '10

Module: ngircd.git Branch: master Commit: f37e495a2badf94fff2eaff24ed730dbceef94e0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f37e495a… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 29 14:19:51 2010 +0100 Command throttling: introduce MAX_COMMANDS_SERVICE New MAX_COMMANDS_SERVICE (currently set to MAX_COMMANDS_SERVER[10]), so that services are handled like servers (and not regular users). --- src/ngircd/conn.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 73a66bb..51ab8fd 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -82,6 +82,7 @@ #define MAX_COMMANDS 3 #define MAX_COMMANDS_SERVER 10 +#define MAX_COMMANDS_SERVICE MAX_COMMANDS_SERVER static bool Handle_Write PARAMS(( CONN_ID Idx )); @@ -1530,7 +1531,7 @@ Read_Request( CONN_ID Idx ) /** * Handle all data in the connection read-buffer. * Data is processed until no complete command is left in the read buffer, - * or MAX_COMMANDS[_SERVER] commands were processed. + * or MAX_COMMANDS[_SERVER|_SERVICE] commands were processed. * When a fatal error occurs, the connection is shut down. * @param Idx Index of the connection. * @return number of bytes processed. @@ -1555,8 +1556,12 @@ Handle_Buffer(CONN_ID Idx) /* Servers do get special command limits, so they can process * all the messages that are required while peering. */ - if (Client_Type(c) == CLIENT_SERVER) - maxcmd = MAX_COMMANDS_SERVER; + switch (Client_Type(c)) { + case CLIENT_SERVER: + maxcmd = MAX_COMMANDS_SERVER; break; + case CLIENT_SERVICE: + maxcmd = MAX_COMMANDS_SERVICE; break; + } starttime = time(NULL); for (i=0; i < maxcmd; i++) {

1 0

Alexander Barton : Xcode: correctly sort files
by alex＠arthur.barton.de 29 Dez '10

29 Dez '10

Module: ngircd.git Branch: master Commit: 4188a82e7674a46903c87e257ebbeeb013dc8146 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4188a82e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 29 14:11:40 2010 +0100 Xcode: correctly sort files --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 98437c1..b9c4685 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -348,8 +348,8 @@ FA322D070CEF74B1001761B3 /* ngircd.h */, FAE5CC2D0CF2308A007D69B6 /* numeric.c */, FAE5CC2C0CF2308A007D69B6 /* numeric.h */, - FA85178A0FA061EC006A1F5A /* op.h */, FA85178B0FA061EC006A1F5A /* op.c */, + FA85178A0FA061EC006A1F5A /* op.h */, FA322D080CEF74B1001761B3 /* parse.c */, FA322D090CEF74B1001761B3 /* parse.h */, FA99428B10E82A27007F27ED /* proc.c */,

1 0

Alexander Barton : Don't throttle services and servers beeing registered
by alex＠arthur.barton.de 29 Dez '10

29 Dez '10

Module: ngircd.git Branch: master Commit: 21cbf37db5647159eced6ed1275e0e2e6980155c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=21cbf37d… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 29 14:12:34 2010 +0100 Don't throttle services and servers beeing registered --- src/ngircd/conn.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 9daca85..73a66bb 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1517,6 +1517,8 @@ Read_Request( CONN_ID Idx ) /* Look at the data in the (read-) buffer of this connection */ My_Connections[Idx].bps += Handle_Buffer(Idx); if (Client_Type(c) != CLIENT_SERVER + && Client_Type(c) != CLIENT_UNKNOWNSERVER + && Client_Type(c) != CLIENT_SERVICE && My_Connections[Idx].bps >= maxbps) { LogDebug("Throttling connection %d: BPS exceeded! (%u >= %u)", Idx, My_Connections[Idx].bps, maxbps);

1 0

Alexander Barton : Don't assert() when serching a client for an invalid server token
by alex＠arthur.barton.de 24 Dez '10

24 Dez '10

Module: ngircd.git Branch: master Commit: 36d4f6c6015a0c93a2785e135d43dc8f23797b38 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=36d4f6c6… Author: Alexander Barton <alex(a)barton.de> Date: Fri Dec 24 12:48:03 2010 +0100 Don't assert() when serching a client for an invalid server token This is only relevant when a trusted server on a server-server link sends invalid commands. --- src/ngircd/client.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 739c5ea..ecd1a7c 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -553,17 +553,19 @@ Client_Search( const char *Nick ) } /* Client_Search */ +/** + * Get client structure ("introducer") identfied by a server token. + * @return CLIENT structure or NULL if none could be found. + */ GLOBAL CLIENT * Client_GetFromToken( CLIENT *Client, int Token ) { - /* Client-Struktur, die den entsprechenden Introducer (=Client) - * und das gegebene Token hat, liefern. Wird keine gefunden, - * so wird NULL geliefert. */ - CLIENT *c; assert( Client != NULL ); - assert( Token > 0 ); + + if (!Token) + return NULL; c = My_Clients; while (c) {

1 0

Tag rel-17.1: Alexander Barton : ngIRCd release 17.1
by alex＠arthur.barton.de 19 Dez '10

19 Dez '10

Module: ngircd.git Branch: refs/tags/rel-17.1 Tag: 1b0d26d24f779265352f10a15acdba605c51b8fb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=1b0d26d24f7… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun Dec 19 16:25:40 2010 +0100 ngIRCd release 17.1

1 0