2002-12-30 17:07:23 +01:00
|
|
|
/*
|
|
|
|
* ngIRCd -- The Next Generation IRC Daemon
|
|
|
|
* Copyright (c)2001,2002 by 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
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
* Please read the file COPYING, README and AUTHORS for more information.
|
|
|
|
*
|
|
|
|
* Connection compression using ZLIB
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include "portab.h"
|
|
|
|
|
2002-12-30 18:14:59 +01:00
|
|
|
#define CONN_MODULE
|
2002-12-30 17:07:23 +01:00
|
|
|
|
|
|
|
|
2003-12-26 16:55:07 +01:00
|
|
|
#ifdef ZLIB
|
2002-12-30 17:07:23 +01:00
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
static char UNUSED id[] = "$Id: conn-zip.c,v 1.8 2005/07/07 18:48:33 fw Exp $";
|
2002-12-30 17:07:23 +01:00
|
|
|
|
|
|
|
#include "imp.h"
|
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <zlib.h>
|
|
|
|
|
|
|
|
#include "conn.h"
|
2002-12-30 18:14:59 +01:00
|
|
|
#include "conn-func.h"
|
2002-12-30 17:07:23 +01:00
|
|
|
#include "log.h"
|
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
#include "array.h"
|
2002-12-30 17:07:23 +01:00
|
|
|
#include "exp.h"
|
|
|
|
#include "conn-zip.h"
|
|
|
|
|
|
|
|
|
2005-03-19 19:43:48 +01:00
|
|
|
GLOBAL bool
|
2002-12-30 17:07:23 +01:00
|
|
|
Zip_InitConn( CONN_ID Idx )
|
|
|
|
{
|
|
|
|
/* Kompression fuer Link initialisieren */
|
|
|
|
|
|
|
|
assert( Idx > NONE );
|
|
|
|
|
|
|
|
My_Connections[Idx].zip.in.avail_in = 0;
|
|
|
|
My_Connections[Idx].zip.in.total_in = 0;
|
|
|
|
My_Connections[Idx].zip.in.total_out = 0;
|
|
|
|
My_Connections[Idx].zip.in.zalloc = NULL;
|
|
|
|
My_Connections[Idx].zip.in.zfree = NULL;
|
|
|
|
My_Connections[Idx].zip.in.data_type = Z_ASCII;
|
|
|
|
|
|
|
|
if( inflateInit( &My_Connections[Idx].zip.in ) != Z_OK )
|
|
|
|
{
|
|
|
|
/* Fehler! */
|
|
|
|
Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib inflate)!", Idx );
|
2005-03-19 19:43:48 +01:00
|
|
|
return false;
|
2002-12-30 17:07:23 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
My_Connections[Idx].zip.out.total_in = 0;
|
|
|
|
My_Connections[Idx].zip.out.total_in = 0;
|
|
|
|
My_Connections[Idx].zip.out.zalloc = NULL;
|
|
|
|
My_Connections[Idx].zip.out.zfree = NULL;
|
|
|
|
My_Connections[Idx].zip.out.data_type = Z_ASCII;
|
|
|
|
|
|
|
|
if( deflateInit( &My_Connections[Idx].zip.out, Z_DEFAULT_COMPRESSION ) != Z_OK )
|
|
|
|
{
|
|
|
|
/* Fehler! */
|
|
|
|
Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib deflate)!", Idx );
|
2005-03-19 19:43:48 +01:00
|
|
|
return false;
|
2002-12-30 17:07:23 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
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 );
|
2005-04-25 20:37:16 +02:00
|
|
|
Conn_OPTION_ADD( &My_Connections[Idx], CONN_ZIP );
|
2002-12-30 17:07:23 +01:00
|
|
|
|
2005-03-19 19:43:48 +01:00
|
|
|
return true;
|
2002-12-30 17:07:23 +01:00
|
|
|
} /* Zip_InitConn */
|
|
|
|
|
|
|
|
|
2005-03-19 19:43:48 +01:00
|
|
|
GLOBAL bool
|
|
|
|
Zip_Buffer( CONN_ID Idx, char *Data, int Len )
|
2002-12-30 17:07:23 +01:00
|
|
|
{
|
|
|
|
/* Daten zum Komprimieren im "Kompressions-Puffer" sammeln.
|
2005-03-19 19:43:48 +01:00
|
|
|
* Es wird true bei Erfolg, sonst false geliefert. */
|
2002-12-30 17:07:23 +01:00
|
|
|
|
|
|
|
assert( Idx > NONE );
|
|
|
|
assert( Data != NULL );
|
|
|
|
assert( Len > 0 );
|
2005-07-07 20:48:33 +02:00
|
|
|
assert( Len <= ZWRITEBUFFER_LEN );
|
2002-12-30 17:07:23 +01:00
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
if (Len < 0 || Len > ZWRITEBUFFER_LEN) return false;
|
|
|
|
|
|
|
|
if ( array_bytes( &My_Connections[Idx].zip.wbuf ) >= ZWRITEBUFFER_LEN ) {
|
|
|
|
/* compression buffer is full, flush */
|
2005-03-19 19:43:48 +01:00
|
|
|
if( ! Zip_Flush( Idx )) return false;
|
2002-12-30 17:07:23 +01:00
|
|
|
}
|
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
return array_catb( &My_Connections[Idx].zip.wbuf, Data, Len );
|
2002-12-30 17:07:23 +01:00
|
|
|
} /* Zip_Buffer */
|
|
|
|
|
|
|
|
|
2005-03-19 19:43:48 +01:00
|
|
|
GLOBAL bool
|
2002-12-30 17:07:23 +01:00
|
|
|
Zip_Flush( CONN_ID Idx )
|
|
|
|
{
|
|
|
|
/* Daten komprimieren und in Schreibpuffer kopieren.
|
2005-03-19 19:43:48 +01:00
|
|
|
* Es wird true bei Erfolg, sonst false geliefert. */
|
2002-12-30 17:07:23 +01:00
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
int result;
|
|
|
|
unsigned char zipbuf[WRITEBUFFER_LEN];
|
|
|
|
unsigned int zipbuf_used = 0;
|
2002-12-30 17:07:23 +01:00
|
|
|
z_stream *out;
|
|
|
|
|
|
|
|
out = &My_Connections[Idx].zip.out;
|
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
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);
|
2002-12-30 17:07:23 +01:00
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
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);
|
2002-12-30 17:07:23 +01:00
|
|
|
result = deflate( out, Z_SYNC_FLUSH );
|
|
|
|
if(( result != Z_OK ) || ( out->avail_in > 0 ))
|
|
|
|
{
|
|
|
|
Log( LOG_ALERT, "Compression error: code %d!?", result );
|
2005-03-19 19:43:48 +01:00
|
|
|
Conn_Close( Idx, "Compression error!", NULL, false );
|
|
|
|
return false;
|
2002-12-30 17:07:23 +01:00
|
|
|
}
|
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
assert(out->avail_out <= WRITEBUFFER_LEN);
|
|
|
|
zipbuf_used = WRITEBUFFER_LEN - out->avail_out;
|
|
|
|
Log(LOG_DEBUG, "zipbuf_used: %d\n", 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);
|
2002-12-30 17:07:23 +01:00
|
|
|
|
2005-03-19 19:43:48 +01:00
|
|
|
return true;
|
2002-12-30 17:07:23 +01:00
|
|
|
} /* Zip_Flush */
|
|
|
|
|
|
|
|
|
2005-03-19 19:43:48 +01:00
|
|
|
GLOBAL bool
|
2002-12-30 17:07:23 +01:00
|
|
|
Unzip_Buffer( CONN_ID Idx )
|
|
|
|
{
|
|
|
|
/* Daten entpacken und in Lesepuffer kopieren. Bei Fehlern
|
2005-03-19 19:43:48 +01:00
|
|
|
* wird false geliefert, ansonsten true. Der Fall, dass keine
|
2002-12-30 17:07:23 +01:00
|
|
|
* Daten mehr zu entpacken sind, ist _kein_ Fehler! */
|
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
int result;
|
|
|
|
unsigned char unzipbuf[READBUFFER_LEN];
|
|
|
|
unsigned int unzipbuf_used = 0;
|
|
|
|
unsigned int z_rdatalen;
|
|
|
|
unsigned int in_len;
|
|
|
|
|
2002-12-30 17:07:23 +01:00
|
|
|
z_stream *in;
|
|
|
|
|
|
|
|
assert( Idx > NONE );
|
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
z_rdatalen = array_bytes(&My_Connections[Idx].zip.rbuf);
|
|
|
|
if (z_rdatalen == 0)
|
|
|
|
return true;
|
2002-12-30 17:07:23 +01:00
|
|
|
|
|
|
|
in = &My_Connections[Idx].zip.in;
|
2005-07-07 20:48:33 +02:00
|
|
|
|
|
|
|
in->next_in = array_start(&My_Connections[Idx].zip.rbuf);
|
|
|
|
assert(in->next_in);
|
|
|
|
if (!in->next_in)
|
|
|
|
return false;
|
2002-12-30 17:07:23 +01:00
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
in->avail_in = z_rdatalen;
|
|
|
|
in->next_out = unzipbuf;
|
|
|
|
in->avail_out = sizeof unzipbuf;
|
2002-12-30 17:07:23 +01:00
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
Log(LOG_DEBUG, "in->avail_in %d, in->avail_out %d", in->avail_in, in->avail_out);
|
2002-12-30 17:07:23 +01:00
|
|
|
result = inflate( in, Z_SYNC_FLUSH );
|
|
|
|
if( result != Z_OK )
|
|
|
|
{
|
2004-04-25 15:55:34 +02:00
|
|
|
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 );
|
2005-03-19 19:43:48 +01:00
|
|
|
Conn_Close( Idx, "Decompression error!", NULL, false );
|
|
|
|
return false;
|
2002-12-30 17:07:23 +01:00
|
|
|
}
|
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
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\n", 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;
|
2002-12-30 17:07:23 +01:00
|
|
|
|
2005-07-07 20:48:33 +02:00
|
|
|
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;
|
2002-12-30 17:07:23 +01:00
|
|
|
}
|
|
|
|
|
2005-03-19 19:43:48 +01:00
|
|
|
return true;
|
2002-12-30 17:07:23 +01:00
|
|
|
} /* Unzip_Buffer */
|
|
|
|
|
|
|
|
|
2005-03-19 19:43:48 +01:00
|
|
|
GLOBAL long
|
2002-12-30 17:07:23 +01:00
|
|
|
Zip_SendBytes( CONN_ID Idx )
|
|
|
|
{
|
|
|
|
/* Anzahl gesendeter Bytes (komprimiert!) liefern */
|
|
|
|
|
|
|
|
assert( Idx > NONE );
|
|
|
|
return My_Connections[Idx].zip.bytes_out;
|
|
|
|
} /* Zip_SendBytes */
|
|
|
|
|
|
|
|
|
2005-03-19 19:43:48 +01:00
|
|
|
GLOBAL long
|
2002-12-30 17:07:23 +01:00
|
|
|
Zip_RecvBytes( CONN_ID Idx )
|
|
|
|
{
|
|
|
|
/* Anzahl gesendeter Bytes (komprimiert!) liefern */
|
|
|
|
|
|
|
|
assert( Idx > NONE );
|
|
|
|
return My_Connections[Idx].zip.bytes_in;
|
|
|
|
} /* Zip_RecvBytes */
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* -eof- */
|