Bug 282: add Class1SwitchingCmd before sending prologue frames

diff --git a/CHANGES b/CHANGES
index f6642916001d5b66b50e8c2265d9e7e35fe10b5f..45a9b4245f4ece8aaa8b03f05b60d0f98ea8eea5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changelog for HylaFAX 4.2.2
 
+* fix error in not employing Class1SwitchingCmd before sending
+  prologue frames (15 Jun 2005)
 * adjust configure for AIX 5 (14 Jun 2005)
 * handle CRP sent as PPS (8 Jun 2005)
 * fix segfault when resetting a received TIFF page (8 Jun 2005)

diff --git a/faxd/Class1Send.c++ b/faxd/Class1Send.c++
index d3caf42f77f012edffd700ba513796b4e9915af4..15e3ac08458de7f07b539bbfc031c34daa4f6169 100644 (file)
--- a/faxd/Class1Send.c++
+++ b/faxd/Class1Send.c++
@@ -538,7 +538,13 @@ Class1Modem::sendPrologue(FaxParams& dcs_caps, const fxStr& tsi)
      */
     bool frameSent;
     if (useV34) frameSent = true;
-    else frameSent = (atCmd(thCmd, AT_NOTHING) && atResponse(rbuf, 7550) == AT_CONNECT);
+    else {
+       if (!atCmd(conf.class1SwitchingCmd, AT_OK)) {
+           protoTrace("Failure to receive silence.");
+           return (false);
+       }
+       frameSent = (atCmd(thCmd, AT_NOTHING) && atResponse(rbuf, 7550) == AT_CONNECT);
+    }
     if (!frameSent)
        return (false);
     if (pwd != fxStr::null) {