mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-10-20 09:07:39 +00:00
Code Issues Releases Wiki Activity

- Conn_Close() ignores recursive calls for the same link now.

Browse Source
This commit is contained in:
Alexander Barton
2003-02-21 19:19:27 +00:00
parent 2a3f8cc57d
commit cf4ad8d6f7
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ngircd/conn.c
View File

@@ -16,7 +16,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: conn.c,v 1.115 2003/01/15 14:28:59 alex Exp $"; static char UNUSED id[] = "$Id: conn.c,v 1.116 2003/02/21 19:19:27 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@@ -529,6 +529,17 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
assert( Idx > NONE ); assert( Idx > NONE );
assert( My_Connections[Idx].sock > 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 */ /* Search client, if any */
c = Client_GetFromConn( Idx ); c = Client_GetFromConn( Idx );
@@ -550,7 +561,7 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
} }
/* Try to write out the write buffer */ /* Try to write out the write buffer */
Try_Write( Idx ); (VOID)Try_Write( Idx );
/* Shut down socket */ /* Shut down socket */
if( close( My_Connections[Idx].sock ) != 0 ) if( close( My_Connections[Idx].sock ) != 0 )