Fixed a wrong assert() which could cause the daemon to exit spuriously
when closing down connections.
This commit is contained in:
parent
292c7bd4c0
commit
1d8da4b525
|
@ -12,6 +12,8 @@
|
||||||
|
|
||||||
ngIRCd CVSHEAD
|
ngIRCd CVSHEAD
|
||||||
|
|
||||||
|
- Fixed a wrong assert() which could cause the daemon to exit spuriously
|
||||||
|
when closing down connections.
|
||||||
- Better logging of decompression errors returned by zlib.
|
- Better logging of decompression errors returned by zlib.
|
||||||
- Servers other than the destination server didn't clean up the invite
|
- Servers other than the destination server didn't clean up the invite
|
||||||
list of an "invite-only" channel properly when an INVITE'd user joined.
|
list of an "invite-only" channel properly when an INVITE'd user joined.
|
||||||
|
@ -511,4 +513,4 @@ ngIRCd 0.0.1, 31.12.2001
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
$Id: ChangeLog,v 1.231 2004/04/25 13:55:34 alex Exp $
|
$Id: ChangeLog,v 1.232 2004/04/25 14:06:11 alex Exp $
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
#include "portab.h"
|
#include "portab.h"
|
||||||
|
|
||||||
static char UNUSED id[] = "$Id: conn.c,v 1.133 2004/03/11 22:16:31 alex Exp $";
|
static char UNUSED id[] = "$Id: conn.c,v 1.134 2004/04/25 14:06:12 alex Exp $";
|
||||||
|
|
||||||
#include "imp.h"
|
#include "imp.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
@ -622,7 +622,6 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
assert( Idx > NONE );
|
assert( Idx > NONE );
|
||||||
assert( My_Connections[Idx].sock > NONE );
|
|
||||||
|
|
||||||
/* Is this link already shutting down? */
|
/* Is this link already shutting down? */
|
||||||
if( My_Connections[Idx].options & CONN_ISCLOSING )
|
if( My_Connections[Idx].options & CONN_ISCLOSING )
|
||||||
|
@ -632,6 +631,8 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
assert( My_Connections[Idx].sock > NONE );
|
||||||
|
|
||||||
/* Mark link as "closing" */
|
/* Mark link as "closing" */
|
||||||
My_Connections[Idx].options |= CONN_ISCLOSING;
|
My_Connections[Idx].options |= CONN_ISCLOSING;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue