[Bug 736] Control channel retrain (V.34 fax) results in disconnect (DCN)

Correct a logic problem in control channel retrains that caused HylaFAX
to consider them unsuccessful even when they succeeded. Thanks to John
Sucaet for the original report and fix, and Lee for the final patch.

diff --git a/CHANGES b/CHANGES
index 73a9528d089e40cf8e17f14005644938d755e319..7bfd3f116fe71127a8e05c033ea56a2ea6b35f5b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog
 
+* improve handling of V.34 control channel retrain (02 Apr 2006)
 * Add isdn4linux modem config prototype (02 Apr 2006)
 * Add IAXmodem config prototype (02 Apr 2006)
 * Update config.guess & config.sub (27 Mar 2006)

diff --git a/faxd/Class1.c++ b/faxd/Class1.c++
index debac8b266eea19eb355e0dc9f499627b4768407..2c0ec11d7c5059794e8201c08b26de1a7aec63c8 100644 (file)
--- a/faxd/Class1.c++
+++ b/faxd/Class1.c++
@@ -561,9 +561,9 @@ Class1Modem::waitForDCEChannel(bool awaitctrl)
                    protoTrace("Control channel retrain");
                    // wait for the control channel to reappear
                    // should we reset the timeout setting?
-                   waitForDCEChannel(true);
+                   gotresponse = waitForDCEChannel(true);
                    gotRTNC = true;
-                   return (false);
+                   return ((awaitctrl ? gotresponse : false));
                    break;
                case 0x6B:
                    protoTrace("Primary channel selected");