Commit Diff

Commit:
9eee0c883b22fef4c21dda6ffdabd41b58634527
From:
Alexander Barton <alex@barton.de>
Date:
Message:
- Client structures are removed correctly now if an outgoing connection can't be estahlished.
Actions:
Patch | Tree
commit - 939767d502c6e9e028c9ef2cfe132dd3bb312c22
commit + 9eee0c883b22fef4c21dda6ffdabd41b58634527
blob - 8ef4bc7a6fe1cda7b208ffa54a627330f209e5e2
blob + 1819e36f62eb70105ed76a002471dd492769f5db
--- src/ngircd/conn.c
+++ src/ngircd/conn.c
@@ -16,7 +16,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.114 2002/12/31 16:13:29 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.115 2003/01/15 14:28:59 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -698,6 +698,7 @@ Handle_Write( CONN_ID Idx )
 	/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
 
 	INT len, res, err;
+	CLIENT *c;
 
 	assert( Idx > NONE );
 	assert( My_Connections[Idx].sock > NONE );
@@ -721,8 +722,10 @@ Handle_Write( CONN_ID Idx )
 			if( res != 0 ) Log( LOG_CRIT, "getsockopt (connection %d): %s!", Idx, strerror( errno ));
 			else Log( LOG_CRIT, "Can't connect socket to \"%s:%d\" (connection %d): %s!", My_Connections[Idx].host, Conf_Server[Conf_GetServer( Idx )].port, Idx, strerror( err ));
 
-			/* Socket etc. pp. aufraeumen */
+			/* Clean up socket, connection and client structures */
 			FD_CLR( My_Connections[Idx].sock, &My_Sockets );
+			c = Client_GetFromConn( Idx );
+			if( c ) Client_DestroyNow( c );
 			close( My_Connections[Idx].sock );
 			Init_Conn_Struct( Idx );