From: Aidan Van Dyk <aidan@ifax.com>
Date: Wed, 26 Sep 2007 12:57:54 +0000 (+0000)
Subject: Class1: Handle T.31 protocol properly
X-Git-Tag: HYLAFAX-6_0_0-beta1~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00c8200e338b594ecfc16cd88e1eded77684f40d;p=thirdparty%2FHylaFAX.git

Class1: Handle T.31 protocol properly

From Lee:
| commit 10f930e821ae10cdb5b169c5d6047a516a0c6855
| Author: Lee Howard <faxguy@howardsilvan.com>
| Date:   Fri Aug 24 23:10:09 2007 +0000
|
|   Handle T.31 protocol properly in this rare circumstance.
---

diff --git a/faxd/Class1Recv.c++ b/faxd/Class1Recv.c++
index 5e5f7dd0..2f3a4d72 100644
--- a/faxd/Class1Recv.c++
+++ b/faxd/Class1Recv.c++
@@ -1664,7 +1664,15 @@ Class1Modem::recvPageECMData(TIFF* tif, const Class2Params& params, Status& eres
 		    return (false);
 		}
 	    } else {
-		if (wasTimeout()) abortReceive();
+		if (wasTimeout()) {
+		    abortReceive();
+		    if (!useV34) {
+			// must now await V.21 signalling
+			long wait = BIT(curcap->br) & BR_ALL ? 273066 / (curcap->br+1) : conf.t2Timer;
+			gotRTNC = atCmd(rhCmd, AT_CONNECT, wait);
+			if (!gotRTNC) syncattempts = 21;
+		    }
+		}
 		if (syncattempts++ > 20) {
 		    eresult = Status(120, "Cannot synchronize ECM frame reception.");
 		    abortPageECMRecv(tif, params, block, fcount, seq, true);