albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up some code, comments and log/debug messages.

This commit is contained in:
Alexander Barton 2005-09-02 13:28:30 +00:00
parent ca32c1b311
commit af9123fd82
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ngircd/conn.c
View File

@ -17,7 +17,7 @@
#include "portab.h" #include "portab.h"
#include "io.h" #include "io.h"
static char UNUSED id[] = "$Id: conn.c,v 1.176 2005/08/30 22:08:00 fw Exp $"; static char UNUSED id[] = "$Id: conn.c,v 1.177 2005/09/02 13:28:30 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -856,23 +856,29 @@ Handle_Write( CONN_ID Idx )
int len; int len;
unsigned int wdatalen; unsigned int wdatalen;
Log(LOG_DEBUG, "Handle_Write");
assert( Idx > NONE ); assert( Idx > NONE );
if ( My_Connections[Idx].sock < 0 ) { if ( My_Connections[Idx].sock < 0 ) {
Log(LOG_WARNING, "Handle_Write() on closed socket, idx %d", Idx); Log(LOG_WARNING,
"Handle_Write() on closed socket, connection %d", Idx);
return false; return false;
} }
assert( My_Connections[Idx].sock > NONE ); assert( My_Connections[Idx].sock > NONE );
#ifdef DEBUG
Log(LOG_DEBUG, "Handle_Write() called for connection %d ...", Idx);
#endif
wdatalen = array_bytes(&My_Connections[Idx].wbuf ); wdatalen = array_bytes(&My_Connections[Idx].wbuf );
#ifdef ZLIB #ifdef ZLIB
if(( wdatalen == 0 ) && ( ! array_bytes(&My_Connections[Idx].zip.wbuf))) { if (wdatalen == 0 && !array_bytes(&My_Connections[Idx].zip.wbuf)) {
io_event_del(My_Connections[Idx].sock, IO_WANTWRITE ); io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
return true; return true;
} }
/* write buffer empty, but not compression buf? -> flush compression buf. */ /* write buffer empty, but not compression buffer?
if( wdatalen == 0 ) Zip_Flush( Idx ); * -> flush compression buffer! */
if (wdatalen == 0)
Zip_Flush(Idx);
#else #else
if (wdatalen == 0) { if (wdatalen == 0) {
io_event_del(My_Connections[Idx].sock, IO_WANTWRITE ); io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
@ -880,14 +886,18 @@ Handle_Write( CONN_ID Idx )
} }
#endif #endif
wdatalen = array_bytes(&My_Connections[Idx].wbuf ); /* Zip_Flush may change wbuf */ /* Zip_Flush() may have changed the write buffer ... */
len = write( My_Connections[Idx].sock, array_start(&My_Connections[Idx].wbuf), wdatalen ); wdatalen = array_bytes(&My_Connections[Idx].wbuf);
len = write(My_Connections[Idx].sock,
array_start(&My_Connections[Idx].wbuf), wdatalen );
if( len < 0 ) { if( len < 0 ) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
return true; return true;
Log( LOG_ERR, "Write error on connection %d (socket %d): %s!", Idx, Log(LOG_ERR, "Write error on connection %d (socket %d): %s!",
My_Connections[Idx].sock, strerror( errno )); Idx, My_Connections[Idx].sock, strerror(errno));
Conn_Close(Idx, "Write error!", NULL, false); Conn_Close(Idx, "Write error!", NULL, false);
return false; return false;
} }
@ -1231,9 +1241,10 @@ Handle_Buffer( CONN_ID Idx )
array_moveleft(&My_Connections[Idx].rbuf, 1, len); array_moveleft(&My_Connections[Idx].rbuf, 1, len);
#ifdef DEBUG #ifdef DEBUG
Log(LOG_DEBUG, "%u byte left in rbuf", array_bytes(&My_Connections[Idx].rbuf)); Log(LOG_DEBUG,
"Connection %d: %d bytes left in read buffer.",
Idx, array_bytes(&My_Connections[Idx].rbuf));
#endif #endif
#ifdef ZLIB #ifdef ZLIB
if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) &&
( array_bytes(&My_Connections[Idx].rbuf) > 0 )) ( array_bytes(&My_Connections[Idx].rbuf) > 0 ))