bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Binkp GZ and BZ2 compression completed

Browse Source
This commit is contained in:
Michiel Broek 2005-06-19 18:34:08 +00:00
parent 942e97f26e
commit 6e075dbde0
5 changed files with 16 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,9 +4,7 @@ $Id$
v0.71.3 13-Jun-2005 v0.71.3 13-Jun-2005
mbcico: mbcico:
Added experimental support for binkp GZ and BZ2 compression. Added support for binkp GZ and BZ2 compression.
Only available with configure --enable-binkdzlib, use with
caution, this is under test.
v0.71.2 16-Jan-2005 - 13-Jun-2005 v0.71.2 16-Jan-2005 - 13-Jun-2005

3
config.h.in
View File

@ -14,9 +14,6 @@
/* Compile experimental code (may not be present) */ /* Compile experimental code (may not be present) */
#undef USE_EXPERIMENT #undef USE_EXPERIMENT
/* Compile experimental binkd compression */
#undef USE_BINKDZLIB
/* Compile full newsgate */ /* Compile full newsgate */
#undef USE_NEWSGATE #undef USE_NEWSGATE

14
configure vendored
View File

@ -842,7 +842,6 @@ Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-experiment Compile experimental code --enable-experiment Compile experimental code
--enable-binkdzlib Compile binkd compression
--enable-debugging Compile for debugging --enable-debugging Compile for debugging
--enable-optimize Enable CPU optimize --enable-optimize Enable CPU optimize
--enable-newsgate Compile with newsgate --enable-newsgate Compile with newsgate
@ -3003,19 +3002,6 @@ if test "$experiment" = "yes"; then
#define USE_EXPERIMENT 1 #define USE_EXPERIMENT 1
_ACEOF _ACEOF
fi
# Check whether --enable-binkdzlib or --disable-binkdzlib was given.
if test "${enable_binkdzlib+set}" = set; then
enableval="$enable_binkdzlib"
binkdzlib=$enableval
else
binkdzlib=no
fi;
if test "$binkdzlib" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define USE_BINKDZLIB 1
_ACEOF
fi fi
# Check whether --enable-debugging or --disable-debugging was given. # Check whether --enable-debugging or --disable-debugging was given.

4
configure.in
View File

@ -71,10 +71,6 @@ AC_ARG_ENABLE(experiment, [ --enable-experiment Compile experimental code]
if test "$experiment" = "yes"; then if test "$experiment" = "yes"; then
AC_DEFINE(USE_EXPERIMENT) AC_DEFINE(USE_EXPERIMENT)
fi fi
AC_ARG_ENABLE(binkdzlib, [ --enable-binkdzlib Compile binkd compression], [ binkdzlib=$enableval ], [ binkdzlib=no ])
if test "$binkdzlib" = "yes"; then
AC_DEFINE(USE_BINKDZLIB)
fi
AC_ARG_ENABLE(debugging, [ --enable-debugging Compile for debugging], [ debugging=$enableval ], [ debugging=no ]) AC_ARG_ENABLE(debugging, [ --enable-debugging Compile for debugging], [ debugging=$enableval ], [ debugging=no ])
if test "$debugging" = "yes"; then if test "$debugging" = "yes"; then

84
mbcico/binkp.c
View File

@ -106,7 +106,6 @@ struct timeval rxtvstart; /* Receiver start time */
struct timeval rxtvend; /* Receiver end time */ struct timeval rxtvend; /* Receiver end time */
#ifdef USE_BINKDZLIB
#if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H) #if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H)
int compress_init(int type, void **data); int compress_init(int type, void **data);
@ -121,7 +120,6 @@ int decompress_abort(int type, void *data);
#define ZBLKSIZE 1024 /* read/write file buffer size */ #define ZBLKSIZE 1024 /* read/write file buffer size */
#endif #endif
#endif
struct binkprec { struct binkprec {
@ -182,7 +180,6 @@ struct binkprec {
int buggyIrex; /* Buggy Irex detected */ int buggyIrex; /* Buggy Irex detected */
#ifdef USE_BINKDZLIB
void *z_idata; /* Data for zstream */ void *z_idata; /* Data for zstream */
void *z_odata; /* Data for zstream */ void *z_odata; /* Data for zstream */
char *z_obuf; /* Compression buffer */ char *z_obuf; /* Compression buffer */
@ -196,10 +193,10 @@ struct binkprec {
#ifdef HAVE_BZLIB_H #ifdef HAVE_BZLIB_H
int BZ2flag; /* BZ2 compression flag */ int BZ2flag; /* BZ2 compression flag */
#endif #endif
#endif
}; };
struct binkprec bp; /* Global structure */ struct binkprec bp; /* Global structure */
@ -260,18 +257,13 @@ int binkp(int role)
bp.cmpblksize = SND_BLKSIZE; bp.cmpblksize = SND_BLKSIZE;
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
bp.PLZflag = WeCan; bp.PLZflag = WeCan;
#ifdef USE_BINKDZLIB
bp.z_obuf = calloc(MAX_BLKSIZE + 3, sizeof(unsigned char)); bp.z_obuf = calloc(MAX_BLKSIZE + 3, sizeof(unsigned char));
bp.GZflag = WeCan; bp.GZflag = WeCan;
#endif
#else #else
bp.PLZflag = No; bp.PLZflag = No;
#endif #endif
#ifdef HAVE_BZLIB_H #ifdef HAVE_BZLIB_H
#ifdef USE_BINKDZLIB
bp.BZ2flag = WeCan; bp.BZ2flag = WeCan;
#endif
#endif #endif
bp.buggyIrex = FALSE; bp.buggyIrex = FALSE;
@ -318,7 +310,6 @@ binkpend:
free(bp.txbuf); free(bp.txbuf);
if (bp.ropts) if (bp.ropts)
free(bp.ropts); free(bp.ropts);
#ifdef USE_BINKDZLIB
#if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H) #if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H)
if ((bp.rmode != CompNone) && bp.z_idata) if ((bp.rmode != CompNone) && bp.z_idata)
decompress_deinit(bp.rmode, bp.z_idata); decompress_deinit(bp.rmode, bp.z_idata);
@ -326,7 +317,6 @@ binkpend:
compress_deinit(bp.tmode, bp.z_odata); compress_deinit(bp.tmode, bp.z_odata);
if (bp.z_obuf) if (bp.z_obuf)
free(bp.z_obuf); free(bp.z_obuf);
#endif
#endif #endif
rc = abs(rc); rc = abs(rc);
@ -600,10 +590,8 @@ SM_STATE(WaitOk)
SM_STATE(Opts) SM_STATE(Opts)
IsDoing("Binkp to %s", ascfnode(remote->addr, 0xf)); IsDoing("Binkp to %s", ascfnode(remote->addr, 0xf));
#ifdef USE_BINKDZLIB
Syslog('b', "Binkp: check for extcmd, current %d", bp.extcmd); Syslog('b', "Binkp: check for extcmd, current %d", bp.extcmd);
if (bp.extcmd) { if (bp.extcmd) {
#ifdef HAVE_BZLIB_H #ifdef HAVE_BZLIB_H
if (bp.BZ2flag == TheyWant) { if (bp.BZ2flag == TheyWant) {
Syslog('+', "Binkp: BZ2 compression active"); Syslog('+', "Binkp: BZ2 compression active");
@ -617,7 +605,6 @@ SM_STATE(Opts)
} }
#endif #endif
} }
#endif
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
if (bp.PLZflag == TheyWant) { if (bp.PLZflag == TheyWant) {
bp.PLZflag = Active; bp.PLZflag = Active;
@ -895,7 +882,6 @@ SM_STATE(PwdAck)
SM_STATE(Opts) SM_STATE(Opts)
IsDoing("Binkp from %s", ascfnode(remote->addr, 0xf)); IsDoing("Binkp from %s", ascfnode(remote->addr, 0xf));
#ifdef USE_BINKDZLIB
Syslog('b', "Binkp: check for extcmd, current %d", bp.extcmd); Syslog('b', "Binkp: check for extcmd, current %d", bp.extcmd);
if (bp.extcmd) { if (bp.extcmd) {
@ -921,7 +907,6 @@ SM_STATE(Opts)
bp.BZ2flag = No; bp.BZ2flag = No;
#endif #endif
} }
#endif
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
if (bp.PLZflag == TheyWant) { if (bp.PLZflag == TheyWant) {
bp.PLZflag = Active; bp.PLZflag = Active;
@ -1110,25 +1095,23 @@ TrType binkp_receiver(void)
return Ok; return Ok;
} }
} else if (bp.RxState == RxAccF) { } else if (bp.RxState == RxAccF) {
#ifdef USE_BINKDZLIB
if ((bp.rmode != CompNone) && bp.z_idata) { if (((bp.rmode == CompGZ) || (bp.rmode == CompBZ2)) && bp.z_idata) {
decompress_deinit(bp.rmode, bp.z_idata); decompress_deinit(bp.rmode, bp.z_idata);
bp.z_idata = NULL; bp.z_idata = NULL;
} }
bp.rmode = CompNone; bp.rmode = CompNone;
#endif
if (strlen(bp.rxbuf) < 512) { if (strlen(bp.rxbuf) < 512) {
sprintf(bp.rname, "%s", strtok(bp.rxbuf+1, " \n\r")); sprintf(bp.rname, "%s", strtok(bp.rxbuf+1, " \n\r"));
bp.rsize = atoi(strtok(NULL, " \n\r")); bp.rsize = atoi(strtok(NULL, " \n\r"));
bp.rtime = atoi(strtok(NULL, " \n\r")); bp.rtime = atoi(strtok(NULL, " \n\r"));
bp.roffs = atoi(strtok(NULL, " \n\r")); bp.roffs = atoi(strtok(NULL, " \n\r"));
sprintf(bp.ropts, "%s", strtok(NULL, " \n\r")); sprintf(bp.ropts, "%s", strtok(NULL, " \n\r"));
Syslog('b', "Binkp: m_file options \"%s\"", bp.ropts);
if (strcmp((char *)"GZ", bp.ropts) == 0) if (strcmp((char *)"GZ", bp.ropts) == 0)
bp.rmode = CompGZ; bp.rmode = CompGZ;
else if (strcmp((char *)"BZ2", bp.ropts) == 0) else if (strcmp((char *)"BZ2", bp.ropts) == 0)
bp.rmode = CompBZ2; bp.rmode = CompBZ2;
Syslog('b', "Binkp: m_file compression %s", cpstate[bp.rmode]);
} else { } else {
/* /*
* Corrupted command, in case this was serious, send the M_GOT back so it's * Corrupted command, in case this was serious, send the M_GOT back so it's
@ -1267,9 +1250,11 @@ TrType binkp_receiver(void)
return Ok; return Ok;
} }
#ifdef USE_BINKDZLIB
written = 0; written = 0;
if (bp.rmode) { if ((bp.rmode == CompBZ2) || (bp.rmode == CompGZ)) {
/*
* Receive stream compressed data
*/
int rc1 = 0, nget = bp.blklen, zavail, nput; int rc1 = 0, nget = bp.blklen, zavail, nput;
char zbuf[ZBLKSIZE]; char zbuf[ZBLKSIZE];
char *buf = bp.rxbuf; char *buf = bp.rxbuf;
@ -1317,9 +1302,6 @@ TrType binkp_receiver(void)
} else { } else {
written = fwrite(bp.rxbuf, 1, bp.blklen, bp.rxfp); written = fwrite(bp.rxbuf, 1, bp.blklen, bp.rxfp);
} }
#else
written = fwrite(bp.rxbuf, 1, bp.blklen, bp.rxfp);
#endif
bp.GotFrame = FALSE; bp.GotFrame = FALSE;
bp.rxlen = 0; bp.rxlen = 0;
@ -1408,10 +1390,7 @@ TrType binkp_receiver(void)
TrType binkp_transmitter(void) TrType binkp_transmitter(void)
{ {
int rc = 0, eof = FALSE; int rc = 0, eof = FALSE, sz, rc1 = 0;
#ifdef USE_BINKDZLIB
int sz, rc1 = 0;
#endif
char *nonhold_mail, *extra; char *nonhold_mail, *extra;
fa_list *eff_remote; fa_list *eff_remote;
file_list *tsl; file_list *tsl;
@ -1492,7 +1471,7 @@ TrType binkp_transmitter(void)
bp.tmode = CompNone; bp.tmode = CompNone;
extra = (char *)""; extra = (char *)"";
#ifdef USE_BINKDZLIB
if ((tmp->compress == CompGZ) || (tmp->compress == CompBZ2)) { if ((tmp->compress == CompGZ) || (tmp->compress == CompBZ2)) {
bp.tmode = tmp->compress; bp.tmode = tmp->compress;
if ((rc1 = compress_init(bp.tmode, &bp.z_odata))) { if ((rc1 = compress_init(bp.tmode, &bp.z_odata))) {
@ -1507,13 +1486,8 @@ TrType binkp_transmitter(void)
Syslog('b', "Binkp: compress_init ok, extra=%s", extra); Syslog('b', "Binkp: compress_init ok, extra=%s", extra);
} }
} }
#endif
#ifdef USE_BINKDZLIB
bp.txpos = bp.txcpos = bp.stxpos = tmp->offset; bp.txpos = bp.txcpos = bp.stxpos = tmp->offset;
#else
bp.txpos = bp.stxpos = tmp->offset;
#endif
bp.txcompressed = 0; bp.txcompressed = 0;
bp.tfsize = tmp->size; bp.tfsize = tmp->size;
Syslog('+', "Binkp: send \"%s\" as \"%s\"", MBSE_SS(tmp->local), MBSE_SS(tmp->remote)); Syslog('+', "Binkp: send \"%s\" as \"%s\"", MBSE_SS(tmp->local), MBSE_SS(tmp->remote));
@ -1563,7 +1537,6 @@ TrType binkp_transmitter(void)
bp.TxState = TxTryR; bp.TxState = TxTryR;
#if USE_BINKDZLIB
#if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H) #if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H)
if ((bp.tmode == CompBZ2) || (bp.tmode == CompGZ)) { if ((bp.tmode == CompBZ2) || (bp.tmode == CompGZ)) {
int nput = 0; /* number of compressed bytes */ int nput = 0; /* number of compressed bytes */
@ -1618,7 +1591,6 @@ TrType binkp_transmitter(void)
} }
} else { } else {
#endif
#endif #endif
/* /*
* Send uncompressed block * Send uncompressed block
@ -1640,10 +1612,8 @@ TrType binkp_transmitter(void)
return Failure; return Failure;
} }
#if USE_BINKDZLIB
#if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H) #if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H)
} }
#endif
#endif #endif
if ((bp.txlen == 0) || eof) { if ((bp.txlen == 0) || eof) {
@ -1670,14 +1640,12 @@ TrType binkp_transmitter(void)
Syslog('+', "Binkp: transmitter skipped file after %ld seconds", txtvend.tv_sec - txtvstart.tv_sec); Syslog('+', "Binkp: transmitter skipped file after %ld seconds", txtvend.tv_sec - txtvstart.tv_sec);
} }
#ifdef USE_BINKDZLIB
if ((bp.tmode == CompBZ2) || (bp.tmode == CompGZ)) { if ((bp.tmode == CompBZ2) || (bp.tmode == CompGZ)) {
compress_deinit(bp.tmode, bp.z_odata); compress_deinit(bp.tmode, bp.z_odata);
bp.z_odata = NULL; bp.z_odata = NULL;
bp.tmode = CompNone; bp.tmode = CompNone;
Syslog('b', "Binkp: compress_deinit done"); Syslog('b', "Binkp: compress_deinit done");
} }
#endif
cursend->state = IsSent; cursend->state = IsSent;
cursend = NULL; cursend = NULL;
@ -1950,9 +1918,7 @@ int binkp_banner(void)
{ {
time_t t; time_t t;
int rc; int rc;
#ifdef USE_BINKDZLIB
char *p; char *p;
#endif
rc = binkp_send_command(MM_NUL,"SYS %s", CFG.bbs_name); rc = binkp_send_command(MM_NUL,"SYS %s", CFG.bbs_name);
if (!rc) if (!rc)
@ -1975,27 +1941,20 @@ int binkp_banner(void)
if (strlen(CFG.comment) && !rc) if (strlen(CFG.comment) && !rc)
rc = binkp_send_command(MM_NUL,"OPM %s", CFG.comment); rc = binkp_send_command(MM_NUL,"OPM %s", CFG.comment);
#ifdef USE_BINKDZLIB /*
if (!rc /* && bp.Role */) { * Send extra options
*/
if (!rc) {
p = xstrcpy((char *)"OPT EXTCMD"); p = xstrcpy((char *)"OPT EXTCMD");
#ifdef HAVE_BZLIB_H #ifdef HAVE_BZLIB_H
p = xstrcat(p, (char *)" BZ2"); p = xstrcat(p, (char *)" BZ2");
#endif #endif
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
p = xstrcat(p, (char *)" GZ"); p = xstrcat(p, (char *)" GZ PLZ");
#endif #endif
rc = binkp_send_command(MM_NUL,"%s", p); rc = binkp_send_command(MM_NUL,"%s", p);
free(p); free(p);
} }
#endif
#ifdef HAVE_ZLIB_H
if (!rc) {
p = xstrcpy((char *)"OPT PLZ");
rc = binkp_send_command(MM_NUL,"%s", p);
free(p);
}
#endif
return rc; return rc;
} }
@ -2110,7 +2069,6 @@ void parse_m_nul(char *msg)
free(bp.MD_Challenge); free(bp.MD_Challenge);
bp.MD_Challenge = MD_getChallenge(q, NULL); bp.MD_Challenge = MD_getChallenge(q, NULL);
} }
#ifdef USE_BINKDZLIB
} else if (strncmp(q, (char *)"EXTCMD", 6) == 0) { } else if (strncmp(q, (char *)"EXTCMD", 6) == 0) {
bp.extcmd = TRUE; bp.extcmd = TRUE;
Syslog('b', "Binkp: remote supports EXTCMD mode"); Syslog('b', "Binkp: remote supports EXTCMD mode");
@ -2124,7 +2082,6 @@ void parse_m_nul(char *msg)
Syslog('b', "BZ2flag is %s and received BZ2 option", opstate[bp.BZ2flag]); Syslog('b', "BZ2flag is %s and received BZ2 option", opstate[bp.BZ2flag]);
} }
#endif #endif
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
} else if (strncmp(q, (char *)"GZ", 2) == 0) { } else if (strncmp(q, (char *)"GZ", 2) == 0) {
if (bp.GZflag == WeCan) { if (bp.GZflag == WeCan) {
@ -2134,8 +2091,6 @@ void parse_m_nul(char *msg)
Syslog('b', "GZflag is %s and received GZ option", opstate[bp.GZflag]); Syslog('b', "GZflag is %s and received GZ option", opstate[bp.GZflag]);
} }
#endif #endif
#endif /* use_binkdzlib */
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
} else if (strncmp(q, (char *)"PLZ", 3) == 0) { } else if (strncmp(q, (char *)"PLZ", 3) == 0) {
if (bp.PLZflag == WeCan) { if (bp.PLZflag == WeCan) {
@ -2318,13 +2273,11 @@ int binkp_process_messages(void)
rmode = CompBZ2; rmode = CompBZ2;
else if (strcmp((char *)"NZ", ropts) == 0) { else if (strcmp((char *)"NZ", ropts) == 0) {
rmode = CompNone; rmode = CompNone;
#ifdef USE_BINKDZLIB
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
bp.GZflag = No; bp.GZflag = No;
#endif #endif
#ifdef HAVE_BZLIB_H #ifdef HAVE_BZLIB_H
bp.BZ2flag = No; bp.BZ2flag = No;
#endif
#endif #endif
Syslog('+', "Binkp: received NZ on M_GET command, compression turned off"); Syslog('+', "Binkp: received NZ on M_GET command, compression turned off");
} }
@ -2655,7 +2608,6 @@ void fill_binkp_list(binkp_list **bkll, file_list *fal, off_t offs)
* Search compression method, but only if GZ or BZ2 compression is active. * Search compression method, but only if GZ or BZ2 compression is active.
*/ */
comp = FALSE; comp = FALSE;
#ifdef USE_BINKDZLIB
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
if (bp.GZflag == Active) if (bp.GZflag == Active)
comp = TRUE; comp = TRUE;
@ -2663,7 +2615,6 @@ void fill_binkp_list(binkp_list **bkll, file_list *fal, off_t offs)
#ifdef HAVE_BZLIB_H #ifdef HAVE_BZLIB_H
if (bp.BZ2flag == Active) if (bp.BZ2flag == Active)
comp = TRUE; comp = TRUE;
#endif
#endif #endif
if (!comp) if (!comp)
return; return;
@ -2683,7 +2634,6 @@ void fill_binkp_list(binkp_list **bkll, file_list *fal, off_t offs)
return; return;
} }
#ifdef USE_BINKDZLIB
#ifdef HAVE_BZLIB_H #ifdef HAVE_BZLIB_H
/* /*
* Use BZ2 for files > 200K * Use BZ2 for files > 200K
@ -2700,7 +2650,6 @@ void fill_binkp_list(binkp_list **bkll, file_list *fal, off_t offs)
Syslog('b', "Binkp: %s compressor GZ", fal->local); Syslog('b', "Binkp: %s compressor GZ", fal->local);
return; return;
} }
#endif
#endif #endif
Syslog('+', "Binkp: compressor select internal error"); Syslog('+', "Binkp: compressor select internal error");
} }
@ -2752,7 +2701,6 @@ void binkp_clear_filelist(int rc)
* *
*/ */
#ifdef USE_BINKDZLIB
int compress_init(int type, void **data) int compress_init(int type, void **data)
{ {
@ -3000,5 +2948,3 @@ int decompress_abort(int type, void *data)
} }
#endif