Bug 118: backing out Brother batch failure catch, as it's really

         a consequence of Bug 633 on our end.

diff --git a/faxd/Class1.c++ b/faxd/Class1.c++
index 97ebc3c68ddc646031d27404adbdae2c79a72fb5..953cad1c67d6f264761a5e53bb278769bd4bae5f 100644 (file)
--- a/faxd/Class1.c++
+++ b/faxd/Class1.c++
@@ -300,7 +300,6 @@ Class1Modem::setupFlowControl(FlowControl fc)
 bool
 Class1Modem::faxService(bool enableV34)
 {
-    lastPPM = 0;       // initializing
     if (!atCmd(classCmd)) return (false);
     if (conf.class1EnableV34Cmd != "" && enableV34)
        atCmd(conf.class1EnableV34Cmd);

diff --git a/faxd/Class1.h b/faxd/Class1.h
index f2640110a60822224acdcbe98fd6425b897deb49..7389fdd1802fe46b13b0618ab0dde6cb28bf29e3 100644 (file)
--- a/faxd/Class1.h
+++ b/faxd/Class1.h
@@ -71,7 +71,7 @@ protected:
     bool       pageGood;               // quality of last page received
     bool       recvdDCN;               // received DCN frame
     bool       messageReceived;        // expect/don't expect message carrier
-    u_int      lastPPM;                // last PPM used
+    u_int      lastPPM;                // last PPM during receive
     bool       sendCFR;                // received TCF was not confirmed
     u_short    ecmBitPos;              // bit position to populate on ecmByte
     u_int      ecmByte;                // pending byte to add to ecmBlock

diff --git a/faxd/Class1Send.c++ b/faxd/Class1Send.c++
index d51ab3c8ababe1ecb9cd6c1a75b0599add26be08..6cbe67d6a2e9235347bf8680548ca9aa4c8528c9 100644 (file)
--- a/faxd/Class1Send.c++
+++ b/faxd/Class1Send.c++
@@ -326,20 +326,12 @@ Class1Modem::sendPhaseB(TIFF* tif, Class2Params& next, FaxMachineInfo& info,
                protoTrace("The destination appears to have trouble with V.34-Fax.");
                return (send_v34fail);
            }
-           /*
-            * Detect receivers that don't support batching.
-            *
-            * Some will fail on the first instance of EOM.  Brother receivers
-            * notoriously will fail to respond to the PPM that follows EOM when
-            * using ECM.
-            */
-           if (batchingError && ((batched & BATCH_FIRST) || (params.ec != EC_DISABLE && lastPPM == FCF_EOM))) {
+           if (batchingError && (batched & BATCH_FIRST)) {
                protoTrace("The destination appears to not support batching.");
                return (send_batchfail);
            }
            return (send_retry);        // a problem, disconnect
        }
-       lastPPM = cmd;                  // remember this PPM
 
        int ncrp = 0;