X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn-zip.c;h=fe7f2fb0e06ffc169aa1956065eaf30e2021c00c;hb=798de94d6556bdf2c6019f368ad7441fe6e2d1be;hp=fa3a11e0a4e15b5da56ed6eb0d7c71fd77a17a0f;hpb=03628dbeaf40a9de34b3eb6d5bf6dd34eed8248c;p=ngircd-alex.git

diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c
index fa3a11e0..fe7f2fb0 100644
--- a/src/ngircd/conn-zip.c
+++ b/src/ngircd/conn-zip.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2007 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -9,6 +9,8 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
+#define CONN_MODULE
+
 #include "portab.h"
 
 /**
@@ -16,14 +18,11 @@
  * Connection compression using ZLIB
  */
 
-#define CONN_MODULE
+/* Additionan debug messages related to ZIP compression: 0=off / 1=on */
+#define DEBUG_ZIP 0
 
 #ifdef ZLIB
 
-/* enable more zlib related debug messages: */
-/* #define DEBUG_ZLIB */
-
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 #include <zlib.h>
@@ -31,9 +30,8 @@
 #include "conn.h"
 #include "conn-func.h"
 #include "log.h"
-
 #include "array.h"
-#include "exp.h"
+
 #include "conn-zip.h"
 
 
@@ -108,8 +106,8 @@ Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len )
 	 * otherwise the zip wbuf would grow too large */
 	buflen = array_bytes(&My_Connections[Idx].zip.wbuf);
 	if (buflen + Len >= WRITEBUFFER_SLINK_LEN) {
-		Log(LOG_ALERT, "Zip Write Buffer overflow: %lu bytes\n", buflen + Len);
-		Conn_Close(Idx, "Zip Write buffer overflow", NULL, false);
+		Log(LOG_ALERT, "Zip Write buffer space exhausted: %lu bytes", buflen + Len);
+		Conn_Close(Idx, "Zip Write buffer space exhausted", NULL, false);
 		return false;
 	}
 	return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len);
@@ -143,7 +141,7 @@ Zip_Flush( CONN_ID Idx )
 	out->next_out = zipbuf;
 	out->avail_out = (uInt)sizeof zipbuf;
 
-#ifdef DEBUG_ZIP
+#if DEBUG_ZIP
 	Log(LOG_DEBUG, "out->avail_in %d, out->avail_out %d",
 		out->avail_in, out->avail_out);
 #endif
@@ -158,7 +156,7 @@ Zip_Flush( CONN_ID Idx )
 	if (out->avail_out <= 0) {
 		/* Not all data was compressed, because data became
 		 * bigger while compressing it. */
-		Log (LOG_ALERT, "Compression error: buffer overvlow!?");
+		Log(LOG_ALERT, "Compression error: buffer overflow!?");
 		Conn_Close(Idx, "Compression error!", NULL, false);
 		return false;
 	}
@@ -166,7 +164,7 @@ Zip_Flush( CONN_ID Idx )
 	assert(out->avail_out <= WRITEBUFFER_SLINK_LEN);
 
 	zipbuf_used = WRITEBUFFER_SLINK_LEN - out->avail_out;
-#ifdef DEBUG_ZIP
+#if DEBUG_ZIP
 	Log(LOG_DEBUG, "zipbuf_used: %d", zipbuf_used);
 #endif
 	if (!array_catb(&My_Connections[Idx].wbuf,
@@ -177,7 +175,7 @@ Zip_Flush( CONN_ID Idx )
 	}
 
 	My_Connections[Idx].bytes_out += zipbuf_used;
-	My_Connections[Idx].zip.bytes_out += array_bytes(&My_Connections[Idx].zip.wbuf); 
+	My_Connections[Idx].zip.bytes_out += array_bytes(&My_Connections[Idx].zip.wbuf);
 	array_trunc(&My_Connections[Idx].zip.wbuf);
 
 	return true;
@@ -200,7 +198,7 @@ Unzip_Buffer( CONN_ID Idx )
 	int unzipbuf_used = 0;
 	unsigned int z_rdatalen;
 	unsigned int in_len;
-	
+
 	z_stream *in;
 
 	assert( Idx > NONE );
@@ -218,7 +216,7 @@ Unzip_Buffer( CONN_ID Idx )
 	in->next_out = unzipbuf;
 	in->avail_out = (uInt)sizeof unzipbuf;
 
-#ifdef DEBUG_ZIP
+#if DEBUG_ZIP
 	Log(LOG_DEBUG, "in->avail_in %d, in->avail_out %d",
 		in->avail_in, in->avail_out);
 #endif
@@ -233,7 +231,7 @@ Unzip_Buffer( CONN_ID Idx )
 	assert(z_rdatalen >= in->avail_in);
 	in_len = z_rdatalen - in->avail_in;
 	unzipbuf_used = READBUFFER_LEN - in->avail_out;
-#ifdef DEBUG_ZIP
+#if DEBUG_ZIP
 	Log(LOG_DEBUG, "unzipbuf_used: %d - %d = %d", READBUFFER_LEN,
 		in->avail_out, unzipbuf_used);
 #endif