Don't exit server if closing of a socket fails; instead ignore it and

pray that this will be "the right thing" ...
This commit is contained in:
Alexander Barton 2005-05-22 23:55:57 +00:00
parent 44fdde7610
commit cd0dc8627d
2 changed files with 6 additions and 6 deletions

View File

@ -11,6 +11,8 @@
ngIRCd CVSHEAD
- Don't exit server if closing of a socket fails; instead ignore it and
pray that this will be "the right thing" ...
- Implemented the IRC function "WHOWAS".
- Don't enable assert() calls when not ./configure'd with --enable-debug.
- Fixed ./configure test for TCP Wrappers: now it runs on Mac OS X as well.
@ -599,4 +601,4 @@ ngIRCd 0.0.1, 31.12.2001
--
$Id: ChangeLog,v 1.270 2005/05/16 12:25:15 alex Exp $
$Id: ChangeLog,v 1.271 2005/05/22 23:55:57 alex Exp $

View File

@ -16,7 +16,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: conn.c,v 1.149 2005/04/23 14:28:44 fw Exp $";
static char UNUSED id[] = "$Id: conn.c,v 1.150 2005/05/22 23:55:58 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -671,10 +671,8 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
/* Shut down socket */
if( close( My_Connections[Idx].sock ) != 0 )
{
/* Oops, we can't close the socket!? This is fatal! */
Log( LOG_EMERG, "Error closing connection %d (socket %d) with %s:%d - %s!", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
exit( 1 );
/* Oops, we can't close the socket!? This is ... ugly! */
Log( LOG_CRIT, "Error closing connection %d (socket %d) with %s:%d - %s! (ignored)", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
}
/* Mark socket as invalid: */