Better logging of decompression errors returned by zlib.

diff --git a/ChangeLog b/ChangeLog
index 5afefd6746a1ff858400963ed2409c7d4b2237a6..783382725e7de9ad68c95083cf905e339a30797c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
 
 ngIRCd CVSHEAD
 
 
 ngIRCd CVSHEAD
 

+  - Better logging of decompression errors returned by zlib.

   - 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.
   - Changed the reply of the MODE command to match the syntax of the
   - 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.
   - Changed the reply of the MODE command to match the syntax of the


@@ -510,4 +511,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
 
 
 -- 

-$Id: ChangeLog,v 1.230 2004/04/09 20:46:46 alex Exp $
+$Id: ChangeLog,v 1.231 2004/04/25 13:55:34 alex Exp $

diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c
index e1a2d41522c3d33e036f5b114f950a867160a680..be65e969d8a354f01b8a81bd78b1ae53b87b5ed5 100644 (file)
--- a/src/ngircd/conn-zip.c
+++ b/src/ngircd/conn-zip.c
@@ -19,7 +19,7 @@
 
 #ifdef ZLIB
 
 
 #ifdef ZLIB
 

-static char UNUSED id[] = "$Id: conn-zip.c,v 1.4 2003/12/26 15:55:07 alex Exp $";
+static char UNUSED id[] = "$Id: conn-zip.c,v 1.5 2004/04/25 13:55:36 alex Exp $";

 
 #include "imp.h"
 #include <assert.h>
 
 #include "imp.h"
 #include <assert.h>


@@ -161,7 +161,7 @@ Unzip_Buffer( CONN_ID Idx )
        result = inflate( in, Z_SYNC_FLUSH );
        if( result != Z_OK )
        {
        result = inflate( in, Z_SYNC_FLUSH );
        if( result != Z_OK )
        {

-               Log( LOG_ALERT, "Decompression error: code %d (ni=%d, ai=%d, no=%d, ao=%d)!?", result, in->next_in, in->avail_in, in->next_out, in->avail_out );
+               Log( LOG_ALERT, "Decompression error: %s (code=%d, ni=%d, ai=%d, no=%d, ao=%d)!?", in->msg, result, in->next_in, in->avail_in, in->next_out, in->avail_out );

                Conn_Close( Idx, "Decompression error!", NULL, FALSE );
                return FALSE;
        }
                Conn_Close( Idx, "Decompression error!", NULL, FALSE );
                return FALSE;
        }