Bug 77: handle EOT after PPS

diff --git a/CHANGES b/CHANGES
index 3732980059510055d08416940a7236d657ff36e1..fd5ac3af44dc8e33b3b323eeec6aedf33239a88f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX
 
+* handle EOT after PPS (28 Feb 2005)
 * add Class1AdaptRecvCmd config option, AT+FAR=1 support, (28 Feb 2005)
 * fix DCS scanline-time error when sending to systems without
   ECM supporting "mixed" scanline-times (24 Feb 2005)

diff --git a/faxd/Class1Send.c++ b/faxd/Class1Send.c++
index 98e869af442a9924465846d17ce47a31956bb730..d51ab3c8ababe1ecb9cd6c1a75b0599add26be08 100644 (file)
--- a/faxd/Class1Send.c++
+++ b/faxd/Class1Send.c++
@@ -1165,7 +1165,7 @@ Class1Modem::blockFrame(const u_char* bitrev, bool lastframe, u_int ppmcmd, fxSt
                        }
                    }
                }
-           } while (!gotppr && (++ppscnt < 3) && (crpcnt < 3));
+           } while (!gotppr && (++ppscnt < 3) && (crpcnt < 3) && !(useV34 && gotEOT));
            if (gotppr) {
                if (!useV34 && !atCmd(conf.class1SwitchingCmd, AT_OK)) {
                    emsg = "Failure to receive silence.";