zx/bforce
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Just a little mistake :)

Browse Source
This commit is contained in:
Sergey Dorofeev 2012-03-25 14:57:25 +04:00
parent eeea113b69
commit a39d822655
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/bforce/prot_binkp.c
View File

@ -534,6 +534,7 @@ case 4:
buf[0] = BPMSG_FILE; buf[0] = BPMSG_FILE;
*block_length = 1+sprintf(buf+1, "%s %ld %ld -1", bstate->pi->send->net_name, *block_length = 1+sprintf(buf+1, "%s %ld %ld -1", bstate->pi->send->net_name,
(long)bstate->pi->send->bytes_total, (long)bstate->pi->send->mod_time); (long)bstate->pi->send->bytes_total, (long)bstate->pi->send->mod_time);
DEB((D_24554, "M_FILE: %s", buf+1));
*block_type = BINKP_BLK_CMD; *block_type = BINKP_BLK_CMD;
return 3; // no state change. phase would be changed to 1 by recv when M_GET is received return 3; // no state change. phase would be changed to 1 by recv when M_GET is received
} }
@ -544,6 +545,7 @@ case 4:
buf[0] = BPMSG_FILE; buf[0] = BPMSG_FILE;
*block_length = 1+sprintf(buf+1, "%s %ld %ld 0", bstate->pi->send->net_name, *block_length = 1+sprintf(buf+1, "%s %ld %ld 0", bstate->pi->send->net_name,
bstate->pi->send->bytes_total, bstate->pi->send->mod_time); bstate->pi->send->bytes_total, bstate->pi->send->mod_time);
DEB((D_24554, "M_FILE: %s", buf+1));
*block_type = BINKP_BLK_CMD; *block_type = BINKP_BLK_CMD;
bstate->phase += 1; bstate->phase += 1;
return 1; return 1;
@ -853,6 +855,8 @@ got_skip:
PROTO_ERROR("error parsing M_GOT/M_SKIP"); PROTO_ERROR("error parsing M_GOT/M_SKIP");
} }
DEB((D_24554, "params: fn=%s sz=%d tm=%d", fi.fn, fi.sz, fi.tm));
if (strcmp (bstate->pi->send->net_name, fi.fn) == 0 && bstate->pi->send->status != FSTAT_WAITACK) { if (strcmp (bstate->pi->send->net_name, fi.fn) == 0 && bstate->pi->send->status != FSTAT_WAITACK) {
DEB((D_24554, "aborting current file")); DEB((D_24554, "aborting current file"));
if (bstate->pi->send->netspool) { if (bstate->pi->send->netspool) {

4
source/bforce/prot_common.c
View File

@ -254,9 +254,9 @@ int p_tx_fopen(s_protinfo *pi, s_filehint *hint)
return 1; return 1;
if (hint) { if (hint) {
DEB((D_OUTBOUND, "trying to reopen file %s size %d time %d", hint->fn, hint->sz, hint->tm)); DEB((D_OUTBOUND, "trying to reopen file %s size %d time %d (nsent=%d)", hint->fn, hint->sz, hint->tm, pi->n_sentfiles));
int i; int i;
for (i=0; i++; i<pi->n_sentfiles) { for (i=0; i<pi->n_sentfiles; i++) {
DEB((D_OUTBOUND, "check %s %d %d", pi->sentfiles[i].net_name, pi->sentfiles[i].bytes_total, pi->sentfiles[i].mod_time)); DEB((D_OUTBOUND, "check %s %d %d", pi->sentfiles[i].net_name, pi->sentfiles[i].bytes_total, pi->sentfiles[i].mod_time));
if (strcmp(pi->sentfiles[i].net_name, hint->fn)==0) { if (strcmp(pi->sentfiles[i].net_name, hint->fn)==0) {
DEB((D_OUTBOUND, "name match")); DEB((D_OUTBOUND, "name match"));

3
source/openwrt-conf
View File

@ -12,7 +12,6 @@ CC=$PREFIX-gcc
export PATH CC CPP export PATH CC CPP
#make clean #make clean
#./configure --prefix=/opt/bforce --host=mips-openwrt-linux --disable-syslog --enable-netspool #./configure --prefix=/opt/bforce --host=mips-openwrt-linux --disable-syslog --enable-netspool --with-logdir=/home/fido/log --with-spooldir=/home/fido/bforce
#--with-logdir=/home/fido/log --with-spooldir=/home/fido/bforce
#make && scp bin/bforce root@gw-home:/opt/bforce/bin/bforce-new #make && scp bin/bforce root@gw-home:/opt/bforce/bin/bforce-new
make && scp bin/bforce root@gw-home:/opt/bforce/bin/bforce make && scp bin/bforce root@gw-home:/opt/bforce/bin/bforce