Changed version string back to "0.6.x-CVS".

ChangeLog

@@ -1,15 +1,19 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001,2002 by Alexander Barton,
+                      (c)2001-2003 by Alexander Barton,
                     alex@barton.de, http://www.barton.de/
 
-                  ngIRCd ist freie Software und steht unter
-                       der GNU General Public License.
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
 
                         -- ChangeLog / Aenderungen --
 
 
+ngIRCd 0.6.x
+
+  - Conn_Close() now handles recurisive calls for the same link correctly.
+
 ngIRCd 0.6.1, 2002-01-21
 
   - Fixed KILL: you can't crash the server by killing yourself any more,
@@ -390,4 +394,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.147.2.13 2003/01/21 21:20:19 alex Exp $
+$Id: ChangeLog,v 1.147.2.14 2003/03/09 20:16:57 alex Exp $

configure.in

@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.69.2.5 2003/01/21 21:23:34 alex Exp $
+# $Id: configure.in,v 1.69.2.6 2003/03/09 22:33:19 alex Exp $
 #
 
 # -- Initialisierung --
@@ -17,7 +17,7 @@ AC_INIT
 AC_PREREQ(2.50)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR(src/config.h.in)
-AM_INIT_AUTOMAKE(ngircd,0.6.1)
+AM_INIT_AUTOMAKE(ngircd,0.6.x-CVS)
 AM_CONFIG_HEADER(src/config.h)
 
 # -- Templates fuer config.h --

src/ngircd/conn.c

@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.106 2002/12/18 13:50:22 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.106.2.1 2003/03/09 20:16:46 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -574,6 +574,18 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 	assert( Idx > NONE );
 	assert( My_Connections[Idx].sock > NONE );
 
+ 	/* Is this link already shutting down? */
+ 	if( My_Connections[Idx].options & CONN_ISCLOSING )
+ 	{
+ 		/* Conn_Close() has been called recursively for this link;
+ 		 * probabe reason: Try_Write() failed  -- see below. */
+ 		return;
+ 	}
+ 
+ 	/* Mark link as "closing" */
+ 	My_Connections[Idx].options |= CONN_ISCLOSING;
+ 
+  	/* Search client, if any */
 	c = Client_GetFromConn( Idx );
 
 	if( InformClient )
@@ -592,9 +604,8 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 		if( My_Connections[Idx].sock == NONE ) return;
 	}
 
-	/* zunaechst versuchen, noch im Schreibpuffer vorhandene
-	 * Daten auf den Socket zu schreiben ... */
-	Try_Write( Idx );
+  	/* Try to write out the write buffer */
+	(VOID)Try_Write( Idx );
 
 	if( close( My_Connections[Idx].sock ) != 0 )
 	{

src/ngircd/conn.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conn.h,v 1.26 2002/12/18 13:50:22 alex Exp $
+ * $Id: conn.h,v 1.26.2.1 2003/03/09 20:16:46 alex Exp $
  *
  * Connection management (header)
  */
@@ -18,11 +18,13 @@
 #define __conn_h__
 
 
-#include <time.h>			/* wg. time_t, s.u. */
+#include <time.h>			/* fro time_t, see below */
 
 
+#define CONN_ISCLOSING 1		/* Conn_Close() already called */
+
 #ifdef USE_ZLIB
-#define CONN_ZIP 4			/* Kompression mit zlib */
+#define CONN_ZIP 2			/* zlib compressed link */
 #endif