#define CONN_MODULE
-#ifdef USE_ZLIB
+#ifdef ZLIB
-static char UNUSED id[] = "$Id: conn-zip.c,v 1.3 2003/04/21 10:52:26 alex Exp $";
+static char UNUSED id[] = "$Id: conn-zip.c,v 1.9 2005/08/02 22:48:57 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 BOOLEAN
+GLOBAL bool
Zip_InitConn( CONN_ID Idx )
{
/* Kompression fuer Link initialisieren */
{
/* Fehler! */
Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib inflate)!", Idx );
- return FALSE;
+ return false;
}
My_Connections[Idx].zip.out.total_in = 0;
{
/* Fehler! */
Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib deflate)!", Idx );
- return FALSE;
+ return false;
}
My_Connections[Idx].zip.bytes_in = My_Connections[Idx].bytes_in;
My_Connections[Idx].zip.bytes_out = My_Connections[Idx].bytes_out;
Log( LOG_INFO, "Enabled link compression (zlib) on connection %d.", Idx );
- Conn_SetOption( Idx, CONN_ZIP );
+ Conn_OPTION_ADD( &My_Connections[Idx], CONN_ZIP );
- return TRUE;
+ return true;
} /* Zip_InitConn */
-GLOBAL BOOLEAN
-Zip_Buffer( CONN_ID Idx, CHAR *Data, INT Len )
+GLOBAL bool
+Zip_Buffer( CONN_ID Idx, char *Data, int Len )
{
/* Daten zum Komprimieren im "Kompressions-Puffer" sammeln.
- * Es wird TRUE bei Erfolg, sonst FALSE geliefert. */
+ * Es wird true bei Erfolg, sonst false geliefert. */
assert( Idx > NONE );
assert( Data != NULL );
assert( Len > 0 );
+ assert( Len <= ZWRITEBUFFER_LEN );
- /* Ist noch Platz im Kompressions-Puffer? */
- if( ZWRITEBUFFER_LEN - My_Connections[Idx].zip.wdatalen < Len + 50 )
- {
- /* Nein! Puffer zunaechst leeren ...*/
- if( ! Zip_Flush( Idx )) return FALSE;
- }
+ if (Len < 0 || Len > ZWRITEBUFFER_LEN) return false;
- /* Daten kopieren */
- memmove( My_Connections[Idx].zip.wbuf + My_Connections[Idx].zip.wdatalen, Data, Len );
- My_Connections[Idx].zip.wdatalen += Len;
+ if ( array_bytes( &My_Connections[Idx].zip.wbuf ) >= ZWRITEBUFFER_LEN ) {
+ /* compression buffer is full, flush */
+ if( ! Zip_Flush( Idx )) return false;
+ }
- return TRUE;
+ return array_catb( &My_Connections[Idx].zip.wbuf, Data, Len );
} /* Zip_Buffer */
-GLOBAL BOOLEAN
+GLOBAL bool
Zip_Flush( CONN_ID Idx )
{
/* Daten komprimieren und in Schreibpuffer kopieren.
- * Es wird TRUE bei Erfolg, sonst FALSE geliefert. */
+ * Es wird true bei Erfolg, sonst false geliefert. */
- INT result, out_len;
+ int result;
+ unsigned char zipbuf[WRITEBUFFER_LEN];
+ unsigned 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->next_in = array_start(&My_Connections[Idx].zip.wbuf);
+ assert(out->next_in);
+ if (!out->next_in)
+ return false;
+
+ out->avail_in = array_bytes(&My_Connections[Idx].zip.wbuf);
+ out->next_out = zipbuf;
+ out->avail_out = sizeof zipbuf;
+
+ Log(LOG_DEBUG, "out->avail_in %d, out->avail_out %d", out->avail_in, out->avail_out);
result = deflate( out, Z_SYNC_FLUSH );
if(( result != Z_OK ) || ( out->avail_in > 0 ))
{
Log( LOG_ALERT, "Compression error: code %d!?", result );
- Conn_Close( Idx, "Compression error!", NULL, FALSE );
- return FALSE;
+ Conn_Close( Idx, "Compression error!", NULL, false );
+ 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;
+ assert(out->avail_out <= WRITEBUFFER_LEN);
+ zipbuf_used = WRITEBUFFER_LEN - out->avail_out;
+ Log(LOG_DEBUG, "zipbuf_used: %d", zipbuf_used);
+ if (!array_catb( &My_Connections[Idx].wbuf, (char*) zipbuf, zipbuf_used ))
+ 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;
+ return true;
} /* Zip_Flush */
-GLOBAL BOOLEAN
+GLOBAL bool
Unzip_Buffer( CONN_ID Idx )
{
/* Daten entpacken und in Lesepuffer kopieren. Bei Fehlern
- * wird FALSE geliefert, ansonsten TRUE. Der Fall, dass keine
+ * 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];
+ unsigned 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 = array_bytes(&My_Connections[Idx].zip.rbuf);
+ if (z_rdatalen == 0)
+ return true;
in = &My_Connections[Idx].zip.in;
+
+ in->next_in = array_start(&My_Connections[Idx].zip.rbuf);
+ assert(in->next_in);
+ if (!in->next_in)
+ return false;
- 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->avail_in = z_rdatalen;
+ in->next_out = unzipbuf;
+ in->avail_out = sizeof unzipbuf;
+ Log(LOG_DEBUG, "in->avail_in %d, in->avail_out %d", in->avail_in, in->avail_out);
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 );
- Conn_Close( Idx, "Decompression error!", NULL, FALSE );
- return FALSE;
+ 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;
}
- 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;
-
- 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 );
+ assert(z_rdatalen >= in->avail_in);
+ in_len = z_rdatalen - in->avail_in;
+ unzipbuf_used = READBUFFER_LEN - in->avail_out;
+ Log(LOG_DEBUG, "unzipbuf_used: %d - %d = %d", READBUFFER_LEN, in->avail_out, unzipbuf_used);
+ assert(unzipbuf_used <= READBUFFER_LEN);
+ if (!array_catb(&My_Connections[Idx].rbuf, (char*) unzipbuf, unzipbuf_used))
+ return false;
+
+ 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;
+ return true;
} /* Unzip_Buffer */
-GLOBAL LONG
+GLOBAL long
Zip_SendBytes( CONN_ID Idx )
{
/* Anzahl gesendeter Bytes (komprimiert!) liefern */
} /* Zip_SendBytes */
-GLOBAL LONG
+GLOBAL long
Zip_RecvBytes( CONN_ID Idx )
{
/* Anzahl gesendeter Bytes (komprimiert!) liefern */
projects / ngircd-alex.git / blobdiff