/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2006 Alexander Barton (alex@barton.de)
*
* 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
#ifdef ZLIB
-static char UNUSED id[] = "$Id: conn-zip.c,v 1.7 2005/04/25 18:37:16 fw Exp $";
+/* enable more zlib related debug messages: */
+/* #define DEBUG_ZLIB */
+
+static char UNUSED id[] = "$Id: conn-zip.c,v 1.15 2007/05/17 15:16:47 alex Exp $";
#include "imp.h"
#include <assert.h>
#include "conn-func.h"
#include "log.h"
+#include "array.h"
#include "exp.h"
#include "conn-zip.h"
GLOBAL bool
-Zip_Buffer( CONN_ID Idx, char *Data, int Len )
+Zip_Buffer( CONN_ID Idx, char *Data, size_t Len )
{
- /* Daten zum Komprimieren im "Kompressions-Puffer" sammeln.
- * Es wird true bei Erfolg, sonst false geliefert. */
+ size_t buflen;
assert( Idx > NONE );
assert( Data != NULL );
assert( Len > 0 );
- /* Ist noch Platz im Kompressions-Puffer? */
- if( ZWRITEBUFFER_LEN - My_Connections[Idx].zip.wdatalen < Len + 50 )
- {
- /* Nein! Puffer zunaechst leeren ...*/
+ buflen = array_bytes(&My_Connections[Idx].zip.wbuf);
+ if (buflen >= WRITEBUFFER_LEN) {
+ /* compression buffer is full, flush */
if( ! Zip_Flush( Idx )) return false;
}
- /* Daten kopieren */
- memmove( My_Connections[Idx].zip.wbuf + My_Connections[Idx].zip.wdatalen, Data, Len );
- My_Connections[Idx].zip.wdatalen += Len;
-
- return true;
+ /* check again; if zip buf is still too large do not append data:
+ * otherwise the zip wbuf would grow too large */
+ buflen = array_bytes(&My_Connections[Idx].zip.wbuf);
+ if (buflen >= WRITEBUFFER_LEN)
+ return false;
+ return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len);
} /* Zip_Buffer */
+/**
+ * Compress data in ZIP buffer and move result to the write buffer of
+ * the connection.
+ * @param Idx Connection handle.
+ * @retrun true on success, false otherwise.
+ */
GLOBAL bool
Zip_Flush( CONN_ID Idx )
{
- /* Daten komprimieren und in Schreibpuffer kopieren.
- * Es wird true bei Erfolg, sonst false geliefert. */
-
- int result, out_len;
+ int result;
+ unsigned char zipbuf[WRITEBUFFER_LEN];
+ int zipbuf_used = 0;
z_stream *out;
out = &My_Connections[Idx].zip.out;
- out->next_in = (void *)My_Connections[Idx].zip.wbuf;
- out->avail_in = My_Connections[Idx].zip.wdatalen;
- out->next_out = (void *)(My_Connections[Idx].wbuf + My_Connections[Idx].wdatalen);
- out->avail_out = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen;
+ out->avail_in = (uInt)array_bytes(&My_Connections[Idx].zip.wbuf);
+ if (!out->avail_in)
+ return true; /* nothing to do. */
+
+ out->next_in = array_start(&My_Connections[Idx].zip.wbuf);
+ assert(out->next_in != NULL);
+
+ out->next_out = zipbuf;
+ out->avail_out = (uInt)sizeof zipbuf;
+#ifdef DEBUG_ZIP
+ Log(LOG_DEBUG, "out->avail_in %d, out->avail_out %d",
+ out->avail_in, out->avail_out);
+#endif
result = deflate( out, Z_SYNC_FLUSH );
if(( result != Z_OK ) || ( out->avail_in > 0 ))
{
return false;
}
- out_len = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - out->avail_out;
- My_Connections[Idx].wdatalen += out_len;
- My_Connections[Idx].bytes_out += out_len;
- My_Connections[Idx].zip.bytes_out += My_Connections[Idx].zip.wdatalen;
- My_Connections[Idx].zip.wdatalen = 0;
+ if (out->avail_out <= 0) {
+ /* Not all data was compressed, because data became
+ * bigger while compressing it. */
+ Log (LOG_ALERT, "Compression error: buffer overvlow!?");
+ Conn_Close(Idx, "Compression error!", NULL, false);
+ return false;
+ }
+
+ assert(out->avail_out <= WRITEBUFFER_LEN);
+
+ zipbuf_used = WRITEBUFFER_LEN - out->avail_out;
+#ifdef DEBUG_ZIP
+ Log(LOG_DEBUG, "zipbuf_used: %d", zipbuf_used);
+#endif
+ if (!array_catb(&My_Connections[Idx].wbuf,
+ (char *)zipbuf, (size_t) zipbuf_used)) {
+ Log (LOG_ALERT, "Compression error: can't copy data!?");
+ Conn_Close(Idx, "Compression error!", NULL, false);
+ return false;
+ }
+
+ My_Connections[Idx].bytes_out += zipbuf_used;
+ My_Connections[Idx].zip.bytes_out += array_bytes(&My_Connections[Idx].zip.wbuf);
+ array_trunc(&My_Connections[Idx].zip.wbuf);
return true;
} /* Zip_Flush */
* wird false geliefert, ansonsten true. Der Fall, dass keine
* Daten mehr zu entpacken sind, ist _kein_ Fehler! */
- int result, in_len, out_len;
+ int result;
+ unsigned char unzipbuf[READBUFFER_LEN];
+ int unzipbuf_used = 0;
+ unsigned int z_rdatalen;
+ unsigned int in_len;
+
z_stream *in;
assert( Idx > NONE );
- if( My_Connections[Idx].zip.rdatalen <= 0 ) return true;
+ z_rdatalen = (unsigned int)array_bytes(&My_Connections[Idx].zip.rbuf);
+ if (z_rdatalen == 0)
+ return true;
in = &My_Connections[Idx].zip.in;
- in->next_in = (void *)My_Connections[Idx].zip.rbuf;
- in->avail_in = My_Connections[Idx].zip.rdatalen;
- in->next_out = (void *)(My_Connections[Idx].rbuf + My_Connections[Idx].rdatalen);
- in->avail_out = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1;
+ in->next_in = array_start(&My_Connections[Idx].zip.rbuf);
+ assert(in->next_in != NULL);
+ in->avail_in = z_rdatalen;
+ in->next_out = unzipbuf;
+ in->avail_out = (uInt)sizeof unzipbuf;
+
+#ifdef DEBUG_ZIP
+ Log(LOG_DEBUG, "in->avail_in %d, in->avail_out %d",
+ in->avail_in, in->avail_out);
+#endif
result = inflate( in, Z_SYNC_FLUSH );
if( result != Z_OK )
{
return false;
}
- in_len = My_Connections[Idx].zip.rdatalen - in->avail_in;
- out_len = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1 - in->avail_out;
- My_Connections[Idx].rdatalen += out_len;
+ assert(z_rdatalen >= in->avail_in);
+ in_len = z_rdatalen - in->avail_in;
+ unzipbuf_used = READBUFFER_LEN - in->avail_out;
+#ifdef DEBUG_ZIP
+ Log(LOG_DEBUG, "unzipbuf_used: %d - %d = %d", READBUFFER_LEN,
+ in->avail_out, unzipbuf_used);
+#endif
+ assert(unzipbuf_used <= READBUFFER_LEN);
+ if (!array_catb(&My_Connections[Idx].rbuf, (char*) unzipbuf,
+ (size_t)unzipbuf_used))
+ return false;
- if( in->avail_in > 0 )
- {
- /* es konnten nicht alle Daten entpackt werden, vermutlich war
- * im Ziel-Puffer kein Platz mehr. Umkopieren ... */
- My_Connections[Idx].zip.rdatalen -= in_len;
- memmove( My_Connections[Idx].zip.rbuf, My_Connections[Idx].zip.rbuf + in_len, My_Connections[Idx].zip.rdatalen );
+ if( in->avail_in > 0 ) {
+ array_moveleft(&My_Connections[Idx].zip.rbuf, 1, in_len );
+ } else {
+ array_trunc( &My_Connections[Idx].zip.rbuf );
+ My_Connections[Idx].zip.bytes_in += unzipbuf_used;
}
- else My_Connections[Idx].zip.rdatalen = 0;
- My_Connections[Idx].zip.bytes_in += out_len;
return true;
} /* Unzip_Buffer */
projects / ngircd-alex.git / blobdiff