From 1bcc9174630a0f7ed4f1302de2c30e0c27b07f3b Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 8 Jun 2005 23:20:54 +0000
Subject: [PATCH] Log warning if streaming disabled in zmodem_send_file().
zmodem_send_from() returns immediately if it receives anything other than a
ZACK in response to a ZCRCW subpacket.
---
src/sbbs3/zmodem.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/sbbs3/zmodem.c b/src/sbbs3/zmodem.c
index 83dd9e9386..a8c2664b57 100644
--- a/src/sbbs3/zmodem.c
+++ b/src/sbbs3/zmodem.c
@@ -1387,15 +1387,13 @@ int zmodem_send_from(zmodem_t* zm, FILE* fp, ulong pos, ulong fsize, ulong* sent
int type;
while(is_connected(zm) && !zm->cancelled) {
type = zmodem_recv_header(zm);
- if(type == ZNAK || type == ZRPOS || type == TIMEOUT) {
- return type;
- }
- if(type == ZACK) {
- if(zm->rxd_header_pos == ftell(fp))
- break;
- lprintf(zm,LOG_WARNING,"ZACK for incorrect offset (%lu vs %lu)"
- ,zm->rxd_header_pos, ftell(fp));
- }
+ if(type != ZACK)
+ return(type);
+
+ if(zm->rxd_header_pos == ftell(fp))
+ break;
+ lprintf(zm,LOG_WARNING,"ZACK for incorrect offset (%lu vs %lu)"
+ ,zm->rxd_header_pos, ftell(fp));
}
if((ulong)ftell(fp) >= fsize) {
@@ -1462,6 +1460,9 @@ BOOL zmodem_send_file(zmodem_t* zm, char* fname, FILE* fp, BOOL request_init, ti
zm->file_skipped=FALSE;
+ if(zm->no_streaming)
+ lprintf(zm,LOG_WARNING,"Streaming disabled");
+
if(request_init) {
for(errors=0; errors<=zm->max_errors && !zm->cancelled && is_connected(zm); errors++) {
lprintf(zm,LOG_INFO,"Sending ZRQINIT (%u of %u)"
--
GitLab