Bug 118: force the Class 2 driver to send AT+FDIS following EOM

diff --git a/CHANGES b/CHANGES
index c69e9f8bf82c223047c07c175c9de59757e04ea9..5d75e14d915b36c1c6dd3ab8689933a15e8ea3b5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX
 
+* force the Class 2 driver to repeat the +FDIS command after EOM
 * add FaxParams class and some utilization of it
 
 Changelog for HylaFAX 4.2.1 - Jan 11, 2005

diff --git a/faxd/Class2Send.c++ b/faxd/Class2Send.c++
index 5d227d7550bb63b622e4e7efc490d04b8651d27c..155f645459734db7ea0613234cc69384a3a0ee9b 100644 (file)
--- a/faxd/Class2Send.c++
+++ b/faxd/Class2Send.c++
@@ -274,8 +274,11 @@ Class2Modem::sendPhaseB(TIFF* tif, Class2Params& next, FaxMachineInfo& info,
            if (!decodePPM(pph, ppm, emsg))
                goto failed;
 
-           if (ppm == PPM_EOP && !(batched & BATCH_LAST))
+           if (ppm == PPM_EOP && !(batched & BATCH_LAST)) {
                ppm = PPM_EOM;
+               // this should force us to resend disCmd, since some modems don't remember
+               params.vr = (u_int) -1;
+           }
 
            tracePPM("SEND send", ppm);
            u_int ppr;