From 20375d7d66a19396839617aa17488bedbaf88ded Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Sat, 13 Sep 2003 21:32:00 +0000 Subject: [PATCH] Minor log improvement, updated TODO --- ChangeLog | 1 + TODO | 11 ++--------- mbcico/binkp.c | 8 ++++++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ebec00a..188fc0ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ v0.37.7 09-Sep-2003 If doesn't do Multiple Batch mode anymore against binkp/1.1 mailers. File resync during receive finally works. + In binkp we don't send a empty dataframe after a file anymore. mbtask: Added support for debug logfile. Dropped the debug switch for diff --git a/TODO b/TODO index ce4454c8..50b713c4 100644 --- a/TODO +++ b/TODO @@ -109,20 +109,13 @@ mbfido: N: Add statistic mail messages. mbcico: - N: Upgrade binkp protocol to 1.1, that may solve the next two - issues as well. - - N: See if it is possible with binkp protocol to resume aborted - transfers. Changes are under test now. Feedback needed! - - N: Implement binkp resync when getting files. Transmit works. - Under test now! + N: Upgrade binkp protocol to 1.1. N: With binkp, if the other node is a binkp/1.0 mailer without MB mode and we did send a FREQ, a poll must be created after the session to pickup the result of the FREQ. - N: Support binkp Argus freqs. + N: Support binkp Argus freqs (Radius too?). mbfile: L: Add a check to see if the magic filenames are (still) valid. diff --git a/mbcico/binkp.c b/mbcico/binkp.c index 56c6d3bf..ab50da43 100644 --- a/mbcico/binkp.c +++ b/mbcico/binkp.c @@ -1389,7 +1389,7 @@ int binkp_batch(file_list *to_send) /* * Send empty dataframe, most binkp mailers need it to detect EOF. */ - binkp_send_data(txbuf, 0); +// binkp_send_data(txbuf, 0); /* * calculate time needed and bytes transferred @@ -1466,7 +1466,11 @@ int binkp_batch(file_list *to_send) if (strcasecmp(tmpg->remote, bp.gname) == 0) { tmpg->state = NoState; tmpg->offset = bp.goffset; - Syslog('+', "Remote wants %s again, offset %ld", bp.gname, bp.goffset); + if (bp.goffset) { + Syslog('+', "Remote wants %s for resync at offset %ld", bp.gname, bp.goffset); + } else { + Syslog('+', "Remote wants %s again", bp.gname); + } bp.TxState = TxGetNextFile; } }