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

Binkp fixes and version bump

Browse Source
This commit is contained in:
Michiel Broek
2004-01-29 21:12:21 +00:00
parent c62614ef84
commit 3b852d7c3f
6 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mbcico/binkp.c
View File

@@ -1605,6 +1605,7 @@ int binkp_send_frame(int cmd, char *buf, int len)
*/
if ((bp.PLZflag == Active) && (len > 20) && (!cmd)) {
zbuf = calloc(BINKP_ZIPBUFLEN, sizeof(char));
zlen = BINKP_PLZ_BLOCK -1;
rcz = compress2(zbuf, &zlen, buf, len, 9);
if (rcz == Z_OK) {
Syslog('b', "Binkp: compressed OK, srclen=%d, destlen=%d, will send compressed=%s",
@@ -1642,6 +1643,7 @@ int binkp_send_frame(int cmd, char *buf, int len)
bp.cmpblksize = SND_BLKSIZE;
}
} else {
Syslog('+', "Binkp: compress error %d", rcz);
rc = PUTCHAR((header >> 8) & 0x00ff);
if (!rc)
rc = PUTCHAR(header & 0x00ff);
@@ -1673,6 +1675,7 @@ int binkp_send_frame(int cmd, char *buf, int len)
FLUSHOUT();
binkp_settimer(BINKP_TIMEOUT);
Nopper();
return rc;
}
@@ -1779,23 +1782,30 @@ int binkp_recv_command(char *buf, unsigned long *len, int *cmd)
*len = *cmd = 0;
b0 = GETCHAR(BINKP_TIMEOUT);
if (tty_status)
if (tty_status) {
Syslog('-', "Binkp: tty_status with b0");
goto to;
}
if (b0 & 0x80)
*cmd = 1;
b1 = GETCHAR(BINKP_TIMEOUT / 2);
if (tty_status)
if (tty_status) {
Syslog('-', "Binkp: tty_status with b1");
goto to;
}
*len = (b0 & 0x7f) << 8;
*len += b1;
GET(buf, *len, BINKP_TIMEOUT / 2);
buf[*len] = '\0';
if (tty_status)
if (tty_status) {
Syslog('-', "Binkp: tty_status with block len=%d", *len);
goto to;
}
binkp_settimer(BINKP_TIMEOUT);
Nopper();
to:
if (tty_status)
@@ -1901,7 +1911,6 @@ int binkp_poll_frame(void)
{
int c, rc = 0, bcmd;
#ifdef HAVE_ZLIB_H
int plz = FALSE;
unsigned long zlen;
char *zbuf;
#endif
@@ -1939,7 +1948,6 @@ int binkp_poll_frame(void)
#ifdef HAVE_ZLIB_H
if (bp.PLZflag == Active) {
bp.blklen = bp.header & 0x3fff;
plz = bp.header & BINKP_PLZ_BLOCK;
} else {
bp.blklen = bp.header & 0x7fff;
}
@@ -1950,8 +1958,10 @@ int binkp_poll_frame(void)
if ((bp.rxlen == (bp.blklen + 1) && (bp.rxlen >= 1))) {
bp.GotFrame = TRUE;
#ifdef HAVE_ZLIB_H
if (plz) {
if ((bp.PLZflag == Active) && (bp.header & BINKP_PLZ_BLOCK)) {
Syslog('b', "Binkp: got a compressed block %d bytes", bp.blklen);
zbuf = calloc(BINKP_ZIPBUFLEN, sizeof(char));
zlen = BINKP_PLZ_BLOCK -1;
rc = uncompress(zbuf, &zlen, bp.rxbuf, bp.rxlen -1);
if (rc == Z_OK) {
bp.rxcompressed += (zlen - (bp.rxlen -1));
@@ -1960,7 +1970,7 @@ int binkp_poll_frame(void)
bp.blklen = zlen;
} else {
free(zbuf);
Syslog('!', "Binkp: uncompress error");
Syslog('!', "Binkp: uncompress error %d", rc);
return 3;
}
free(zbuf);
@@ -1978,6 +1988,7 @@ int binkp_poll_frame(void)
Syslog('b', "Binkp: rcvd data (%d)", bp.rxlen -1);
}
binkp_settimer(BINKP_TIMEOUT);
Nopper();
rc = 1;
break;
}

18
mbcico/filelist.c
View File

@@ -219,8 +219,8 @@ static void check_flo(file_list **lst, char *nm)
void check_filebox(char *, file_list *);
void check_filebox(char *boxpath, file_list *st)
void check_filebox(char *, file_list **);
void check_filebox(char *boxpath, file_list **st)
{
char *temp;
DIR *dp;
@@ -245,7 +245,7 @@ void check_filebox(char *boxpath, file_list *st)
* We own the file
*/
if ((stbuf.st_mode & S_IRUSR) && (stbuf.st_mode & S_IWUSR)) {
add_list(&st, temp, de->d_name, KFS, 0L, NULL, 1);
add_list(st, temp, de->d_name, KFS, 0L, NULL, 1);
} else {
Syslog('+', "No R/W permission on %s", temp);
}
@@ -254,7 +254,7 @@ void check_filebox(char *boxpath, file_list *st)
* We own the file group
*/
if ((stbuf.st_mode & S_IRGRP) && (stbuf.st_mode & S_IWGRP)) {
add_list(&st, temp, de->d_name, KFS, 0L, NULL, 1);
add_list(st, temp, de->d_name, KFS, 0L, NULL, 1);
} else {
Syslog('+', "No R/W permission on %s", temp);
}
@@ -263,7 +263,7 @@ void check_filebox(char *boxpath, file_list *st)
* No owner of file
*/
if ((stbuf.st_mode & S_IROTH) && (stbuf.st_mode & S_IWOTH)) {
add_list(&st, temp, de->d_name, KFS, 0L, NULL, 1);
add_list(st, temp, de->d_name, KFS, 0L, NULL, 1);
} else {
Syslog('+', "No R/W permission on %s", temp);
}
@@ -309,7 +309,7 @@ file_list *create_filelist(fa_list *al, char *fl, int create)
if ((tmpa->addr) && Loaded && strlen(nodes.OutBox) &&
(tmpa->addr->zone == nodes.Aka[0].zone) && (tmpa->addr->net == nodes.Aka[0].net) &&
(tmpa->addr->node == nodes.Aka[0].node) && (tmpa->addr->point == nodes.Aka[0].point)) {
check_filebox(nodes.OutBox, st);
check_filebox(nodes.OutBox, &st);
}
/*
@@ -429,7 +429,7 @@ file_list *create_filelist(fa_list *al, char *fl, int create)
if ((fa->zone==tmpa->addr->zone) && (fa->net==tmpa->addr->net) &&
(fa->node==tmpa->addr->node) && (fa->point==tmpa->addr->point) &&
strchr(fl, flavor))
check_filebox(temp, st);
check_filebox(temp, &st);
}
tidy_faddr(fa);
}
@@ -464,7 +464,7 @@ file_list *create_filelist(fa_list *al, char *fl, int create)
if ((fa->zone==tmpa->addr->zone) && (fa->net==tmpa->addr->net) &&
(fa->node==tmpa->addr->node) && (fa->point==tmpa->addr->point) &&
strchr(fl, flavor))
check_filebox(temp, st);
check_filebox(temp, &st);
}
}
tidy_faddr(fa);
@@ -477,6 +477,8 @@ file_list *create_filelist(fa_list *al, char *fl, int create)
}
free(temp);
Syslog('o', "B4 FTS-0001 checkpoint");
/*
* For FTS-0001 we need to create at least one packet.
*/