Januar 2009 - ngIRCd GIT Updates

Alexander Barton : Xcode: build ngIRCd with IPv6 support on Mac OS X
by alex＠arthur.barton.de 06 Jan '09

06 Jan '09

Module: ngircd.git Branch: master Commit: 75243ffb37aa1947a40435e79802626eb1ae11b3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=75243ffb… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 6 17:39:11 2009 +0100 Xcode: build ngIRCd with IPv6 support on Mac OS X --- contrib/MacOSX/config.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 9fd2dfc..5ed07d9 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -48,6 +48,9 @@ /* Define if zlib compression should be enabled */ #define ZLIB 1 +/* Define if IPV6 protocol should be enabled */ +#define WANT_IPV6 1 + /* -- Supported features -- */ /* Define if SSP C support is enabled. */ @@ -83,6 +86,12 @@ #define HAVE_STRDUP 1 /* Define to 1 if you have the `vsnprintf' function. */ #define HAVE_VSNPRINTF 1 +/* Define to 1 if you have the `inet_aton' function. */ +#define HAVE_INET_ATON 1 +/* Define to 1 if you have the `getaddrinfo' function. */ +#define HAVE_GETADDRINFO 1 +/* Define to 1 if you have the `getnameinfo' function. */ +#define HAVE_GETNAMEINFO 1 /* Define if socklen_t exists */ #define HAVE_socklen_t 1

1 0

Alexander Barton : Xcode: get release number dynamically; new make target " xcode-clean".
by alex＠arthur.barton.de 06 Jan '09

06 Jan '09

Module: ngircd.git Branch: master Commit: 5468ba37446a85bfb8a84eed74bf6c091156f682 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5468ba37… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 6 16:01:52 2009 +0100 Xcode: get release number dynamically; new make target "xcode-clean". - make target "xcode" now detects the release number stored in the configure.in file and passes it to Xcode. - new make target "xcode-clean" which removes all files generated by "make xcode" and removes the Xcode build directory. --- Makefile.am | 15 ++++++++++++--- contrib/MacOSX/config.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 701bf6b..0fd0622 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,12 +32,21 @@ lint: srcdoc: make -C doc srcdoc -xcode: +have-xcodebuild: @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \ >/dev/null 2>&1 \ || ( echo; echo "Error: \"xcodebuild\" not found!"; echo; exit 1 ) + +xcode: have-xcodebuild + rel=`grep AC_INIT configure.in | cut -d' ' -f2 | cut -d')' -f1`; \ + def="GCC_PREPROCESSOR_DEFINITIONS=\"VERSION=\\\"$$rel\\\"\""; \ + xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -alltargets \ + -configuration Default $$def build + +xcode-clean: have-xcodebuild xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -alltargets \ - -buildstyle Development + -configuration Default clean + rm -fr contrib/MacOSX/build rpm: distcheck rpm -ta ngircd-*.tar.gz @@ -46,7 +55,7 @@ deb: [ -f debian/rules ] || ln -s contrib/Debian debian dpkg-buildpackage -rfakeroot -i -osxpkg: +osxpkg: have-xcodebuild @packagemaker >/dev/null 2>&1; [ $$? -ge 1 ] \ || ( echo; echo "Error: \"packagemaker\" not found!"; echo; exit 2) make clean diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 0b5a141..9fd2dfc 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -12,7 +12,9 @@ */ #define PACKAGE_NAME "ngircd" +#ifndef VERSION #define VERSION "??" +#endif #define SYSCONFDIR "/etc/ngircd" #ifndef TARGET_VENDOR

1 0

Alexander Barton : Xcode: define TARGET_VENDOR and TARGET_OS
by alex＠arthur.barton.de 06 Jan '09

06 Jan '09

Module: ngircd.git Branch: master Commit: eb159e0a8d38449c10680cf3ed747fdb5c5adbc8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=eb159e0a… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 6 16:00:15 2009 +0100 Xcode: define TARGET_VENDOR and TARGET_OS --- contrib/MacOSX/config.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 8882e46..0b5a141 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2007 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2009 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 @@ -8,8 +8,6 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: config.h,v 1.1 2007/11/19 22:11:36 alex Exp $ - * * Static configuration file for Mac OS X Xcode project */ @@ -17,6 +15,11 @@ #define VERSION "??" #define SYSCONFDIR "/etc/ngircd" +#ifndef TARGET_VENDOR +#define TARGET_VENDOR "apple" +#define TARGET_OS "darwin" +#endif + /* -- Build options -- */ /* Define if debug-mode should be enabled */

1 0

Alexander Barton : Add new and missing files to Mac OS X Xcode project
by alex＠arthur.barton.de 06 Jan '09

06 Jan '09

Module: ngircd.git Branch: master Commit: df3473c9c102aef7ccbdf0d8188dac318e72ac5e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=df3473c9… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 6 15:09:39 2009 +0100 Add new and missing files to Mac OS X Xcode project --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 56 ++++++++++++++++++++++- 1 files changed, 54 insertions(+), 2 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=df34…

1 0

Alexander Barton : Rename Channel_Free() to Free_Channel(), it is a local function
by alex＠arthur.barton.de 05 Jan '09

05 Jan '09

Module: ngircd.git Branch: master Commit: a11e895045a52f4b57cfc69a8f051af6f0c25997 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a11e8950… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 5 13:53:33 2009 +0100 Rename Channel_Free() to Free_Channel(), it is a local function --- src/ngircd/channel.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 9a59712..8caa81a 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -58,7 +58,7 @@ static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIE 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 Channel_Free PARAMS(( CHANNEL *Chan )); +static void Free_Channel PARAMS(( CHANNEL *Chan )); GLOBAL void @@ -148,7 +148,7 @@ Channel_InitPredefined( void ) static void -Channel_Free(CHANNEL *chan) +Free_Channel(CHANNEL *chan) { array_free(&chan->topic); Lists_Free(&chan->list_bans); @@ -168,7 +168,7 @@ Channel_Exit( void ) c = My_Channels; while (c) { c_next = c->next; - Channel_Free(c); + Free_Channel(c); c = c_next; } @@ -1104,7 +1104,7 @@ Delete_Channel(CHANNEL *Chan) My_Channels = chan->next; LogDebug("Freed channel structure for \"%s\".", Chan->name); - Channel_Free(Chan); + Free_Channel(Chan); } /* Delete_Channel */

1 0

Alexander Barton : Clean up channel allocation table on shutdown/restart.
by alex＠arthur.barton.de 05 Jan '09

05 Jan '09

Module: ngircd.git Branch: master Commit: 175f0af979bfdb6dfde1535dd7de6a452cf98e32 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=175f0af9… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 5 12:58:37 2009 +0100 Clean up channel allocation table on shutdown/restart. Silly bug: the condition of a while() loop in the Channel_Exit() function used the wrong variable and therefore got never executed ... This bug is in the code since the beginning (see commit bb19cfda in 2002); shame on me! --- src/ngircd/channel.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index ba5e725..9a59712 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2009 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 @@ -174,10 +174,9 @@ Channel_Exit( void ) /* Free Channel allocation table */ cl2chan = My_Cl2Chan; - while( c ) - { + while (cl2chan) { cl2chan_next = cl2chan->next; - free( cl2chan ); + free(cl2chan); cl2chan = cl2chan_next; } } /* Channel_Exit */

1 0

Florian Westphal : Add Channel_Free().
by alex＠arthur.barton.de 05 Jan '09

05 Jan '09

Module: ngircd.git Branch: master Commit: 40a0e9abbe8cfd959dd920f2af32976f1eda1a6a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=40a0e9ab… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 4 22:50:49 2009 +0100 Add Channel_Free(). Central function to free a channel structure and all its resources (invite/ban lists, topic, ...). --- src/ngircd/channel.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index b93f223..ba5e725 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -57,7 +57,8 @@ static CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client )); static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer )); static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan )); static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan )); -static bool Delete_Channel PARAMS(( CHANNEL *Chan )); +static void Delete_Channel PARAMS(( CHANNEL *Chan )); +static void Channel_Free PARAMS(( CHANNEL *Chan )); GLOBAL void @@ -146,6 +147,17 @@ Channel_InitPredefined( void ) } /* Channel_InitPredefined */ +static void +Channel_Free(CHANNEL *chan) +{ + array_free(&chan->topic); + Lists_Free(&chan->list_bans); + Lists_Free(&chan->list_invites); + + free(chan); +} + + GLOBAL void Channel_Exit( void ) { @@ -154,11 +166,9 @@ Channel_Exit( void ) /* free struct Channel */ c = My_Channels; - while( c ) - { + while (c) { c_next = c->next; - array_free(&c->topic); - free( c ); + Channel_Free(c); c = c_next; } @@ -1070,7 +1080,7 @@ Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel ) /** * Remove a channel and free all of its data structures. */ -static bool +static void Delete_Channel(CHANNEL *Chan) { CHANNEL *chan, *last_chan; @@ -1083,23 +1093,19 @@ Delete_Channel(CHANNEL *Chan) last_chan = chan; chan = chan->next; } - if (!chan) - return false; - Log(LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name); - - array_free(&chan->topic); - Lists_Free(&chan->list_bans); - Lists_Free(&chan->list_invites); + assert(chan != NULL); + if (!chan) + return; /* maintain channel list */ if (last_chan) last_chan->next = chan->next; else My_Channels = chan->next; - free(chan); - return true; + LogDebug("Freed channel structure for \"%s\".", Chan->name); + Channel_Free(Chan); } /* Delete_Channel */

1 0

Alexander Barton : Free topic array on channel deletion.
by alex＠arthur.barton.de 04 Jan '09

04 Jan '09

Module: ngircd.git Branch: branch-0-12-x Commit: b00a08ef405746ecbdb8b44ba825d1c5a254dfb0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b00a08ef… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 4 15:22:32 2009 +0100 Free topic array on channel deletion. The topic array in the CHANNEL structure must be free()'d before the channel itself becomes deleted. (backport of commit 18efc7469c of master branch) --- src/ngircd/channel.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 32f911a..44133e4 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1027,9 +1027,9 @@ Delete_Channel( CHANNEL *Chan ) Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name ); - /* Invite- und Ban-Lists aufraeumen */ - Lists_Free( &chan->list_bans ); - Lists_Free( &chan->list_invites ); + array_free(&chan->topic); + Lists_Free(&chan->list_bans); + Lists_Free(&chan->list_invites); /* Neu verketten und freigeben */ if( last_chan ) last_chan->next = chan->next;

1 0

Alexander Barton : Clean up (reformat and comment) Delete_Channel() function.
by alex＠arthur.barton.de 04 Jan '09

04 Jan '09

Module: ngircd.git Branch: master Commit: 0659503afd8b8ea4909e4609a7ae65d20de47091 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0659503a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 4 15:25:07 2009 +0100 Clean up (reformat and comment) Delete_Channel() function. --- src/ngircd/channel.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 6958831..b93f223 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1067,35 +1067,40 @@ Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel ) } /* Get_Next_Cl2Chan */ +/** + * Remove a channel and free all of its data structures. + */ static bool -Delete_Channel( CHANNEL *Chan ) +Delete_Channel(CHANNEL *Chan) { - /* delete channel structure */ - CHANNEL *chan, *last_chan; last_chan = NULL; chan = My_Channels; - while( chan ) - { - if( chan == Chan ) break; + while (chan) { + if (chan == Chan) + break; last_chan = chan; chan = chan->next; } - if( ! chan ) return false; + if (!chan) + return false; - Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name ); + Log(LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name); array_free(&chan->topic); Lists_Free(&chan->list_bans); Lists_Free(&chan->list_invites); /* maintain channel list */ - if( last_chan ) last_chan->next = chan->next; - else My_Channels = chan->next; - free( chan ); + if (last_chan) + last_chan->next = chan->next; + else + My_Channels = chan->next; + free(chan); return true; } /* Delete_Channel */ + /* -eof- */

1 0

Alexander Barton : Free topic array on channel deletion.
by alex＠arthur.barton.de 04 Jan '09

04 Jan '09

Module: ngircd.git Branch: master Commit: 18efc7469c5923a298a218ee2d17f518cff184fa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=18efc746… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 4 15:22:32 2009 +0100 Free topic array on channel deletion. The topic array in the CHANNEL structure must be free()'d before the channel itself becomes deleted. --- src/ngircd/channel.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 29b8bec..6958831 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1086,9 +1086,9 @@ Delete_Channel( CHANNEL *Chan ) Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name ); - /* free invite and ban lists */ - Lists_Free( &chan->list_bans ); - Lists_Free( &chan->list_invites ); + array_free(&chan->topic); + Lists_Free(&chan->list_bans); + Lists_Free(&chan->list_invites); /* maintain channel list */ if( last_chan ) last_chan->next = chan->next;

1 0