From 5d93df09bca5e4b3ef5960559d54a57cdcd0c237 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Fri, 12 Mar 2010 19:29:58 +0000
Subject: [PATCH] Move wait for response into zmodem_recv_crc() where it
belongs.
---
src/sbbs3/zmodem.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/sbbs3/zmodem.c b/src/sbbs3/zmodem.c
index 400d373bb4..29afc3c8aa 100644
--- a/src/sbbs3/zmodem.c
+++ b/src/sbbs3/zmodem.c
@@ -1344,10 +1344,6 @@ BOOL zmodem_request_crc(zmodem_t* zm, int32_t length)
{
zmodem_recv_purge(zm);
zmodem_send_pos_header(zm,ZCRC,length,TRUE);
- if(!zmodem_data_waiting(zm,zm->crc_timeout)) {
- lprintf(zm,LOG_ERR,"Timeout waiting for response (%u seconds)", zm->crc_timeout);
- return(FALSE);
- }
return TRUE;
}
@@ -1355,6 +1351,10 @@ BOOL zmodem_recv_crc(zmodem_t* zm, uint32_t* crc)
{
int type;
+ if(!zmodem_data_waiting(zm,zm->crc_timeout)) {
+ lprintf(zm,LOG_ERR,"Timeout waiting for response (%u seconds)", zm->crc_timeout);
+ return(FALSE);
+ }
if((type=zmodem_recv_header(zm))!=ZCRC) {
lprintf(zm,LOG_ERR,"Received %s instead of ZCRC", frame_desc(type));
return(FALSE);
--
GitLab