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

Small fixes for binkp

Browse Source
This commit is contained in:
Michiel Broek 2004-01-26 14:13:57 +00:00
parent dcf02dc386
commit df5f9a3ee8
2 changed files with 12 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ v0.39.8 26-Jan-2004
mbcico: mbcico:
Fixed binkp file resync. Fixed binkp file resync.
Binkp now only tries to compress data frames.
v0.39.7 14-Jan-2004 - 26-Jan-2004 v0.39.7 14-Jan-2004 - 26-Jan-2004

65
mbcico/binkp.c
View File

@ -1602,7 +1602,10 @@ int binkp_send_frame(int cmd, char *buf, int len)
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
last = bp.cmpblksize; last = bp.cmpblksize;
if ((bp.PLZflag == Active) && (len > 20)) { /*
* Only use compression for DATA blocks larger then 20 bytes.
*/
if ((bp.PLZflag == Active) && (len > 20) && (!cmd)) {
zbuf = calloc(BINKP_ZIPBUFLEN, sizeof(char)); zbuf = calloc(BINKP_ZIPBUFLEN, sizeof(char));
rcz = compress2(zbuf, &zlen, buf, len, 9); rcz = compress2(zbuf, &zlen, buf, len, 9);
if (rcz == Z_OK) { if (rcz == Z_OK) {
@ -1616,21 +1619,16 @@ int binkp_send_frame(int cmd, char *buf, int len)
* a dynamic optimal blocksize. The average maximum * a dynamic optimal blocksize. The average maximum
* blocksize on the line will be 4096 bytes. * blocksize on the line will be 4096 bytes.
*/ */
if (!cmd) { bp.cmpblksize = ((len * 4) / zlen) * 512;
bp.cmpblksize = ((len * 4) / zlen) * 512; if (bp.cmpblksize < SND_BLKSIZE)
if (bp.cmpblksize < SND_BLKSIZE) bp.cmpblksize = SND_BLKSIZE;
bp.cmpblksize = SND_BLKSIZE; if (bp.cmpblksize > (BINKP_PLZ_BLOCK -1))
if (bp.cmpblksize > (BINKP_PLZ_BLOCK -1)) bp.cmpblksize = (BINKP_PLZ_BLOCK -1);
bp.cmpblksize = (BINKP_PLZ_BLOCK -1);
}
/* /*
* Rebuild header for compressed block * Rebuild header for compressed block
*/ */
if (cmd) { header = ((BINKP_DATA_BLOCK + BINKP_PLZ_BLOCK + zlen) & 0xffff);
header = ((BINKP_CONTROL_BLOCK + BINKP_PLZ_BLOCK + zlen) & 0xffff);
} else {
header = ((BINKP_DATA_BLOCK + BINKP_PLZ_BLOCK + zlen) & 0xffff);
}
rc = PUTCHAR((header >> 8) & 0x00ff); rc = PUTCHAR((header >> 8) & 0x00ff);
if (!rc) if (!rc)
rc = PUTCHAR(header & 0x00ff); rc = PUTCHAR(header & 0x00ff);
@ -1779,10 +1777,6 @@ int binkp_banner(void)
int binkp_recv_command(char *buf, unsigned long *len, int *cmd) int binkp_recv_command(char *buf, unsigned long *len, int *cmd)
{ {
int b0, b1; int b0, b1;
#ifdef HAVE_ZLIB_H
int rc, zlen, plz = FALSE;
char *zbuf;
#endif
*len = *cmd = 0; *len = *cmd = 0;
@ -1792,52 +1786,15 @@ int binkp_recv_command(char *buf, unsigned long *len, int *cmd)
if (b0 & 0x80) if (b0 & 0x80)
*cmd = 1; *cmd = 1;
#ifdef HAVE_ZLIB_H
/*
* During session setup even if we are not yet in PLZ mode,
* we already accept zlib compressed packets. This assumes
* that there are no command messages longer then 16Kb.
*/
if ((b0 & 0x40) && (bp.PLZflag != No)) {
Syslog('b', "Binkp: binkp_recv_command() compressed block");
plz = TRUE;
}
#endif
b1 = GETCHAR(BINKP_TIMEOUT / 2); b1 = GETCHAR(BINKP_TIMEOUT / 2);
if (tty_status) if (tty_status)
goto to; goto to;
#ifdef HAVE_ZLIB_H
if (plz) {
*len = (b0 & 0x3f) << 8;
zbuf = calloc(BINKP_ZIPBUFLEN, sizeof(char));
GET(zbuf, *len, BINKP_TIMEOUT / 2);
zlen = *len;
rc = uncompress(buf, len, zbuf, zlen);
free(zbuf);
if (rc == Z_OK) {
Syslog('b', "Binkp: uncompress size %d => %d", zlen, len);
} else {
Syslog('b', "Binkp: uncompress error %d", rc);
tty_status = STAT_UNCOMP;
}
buf[*len] = '\0';
} else {
*len = (b0 & 0x7f) << 8;
*len += b1;
GET(buf, *len, BINKP_TIMEOUT / 2);
buf[*len] = '\0';
}
#else
*len = (b0 & 0x7f) << 8; *len = (b0 & 0x7f) << 8;
*len += b1; *len += b1;
GET(buf, *len, BINKP_TIMEOUT / 2); GET(buf, *len, BINKP_TIMEOUT / 2);
buf[*len] = '\0'; buf[*len] = '\0';
#endif
if (tty_status) if (tty_status)
goto to; goto to;