[Bug 754] "Fax protocol error" in ECM mode

This patch, by Lee Howard, fixes a error that is revealed by some compilers
that could lead to looping.

diff --git a/CHANGES b/CHANGES
index 5b808bbdb18ff408bee9897d15a5c6b5d683c5c9..a6c9cbf2112faafa49d4acccb5580c9eaef6d7cb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog
 
+* fix incorrect "Fax protocol error" in ECM mode (03 Apr 2006)
 * add German NSFs and correct HylaFAX NSF bit order (03 Apr 2006)
 * set Class1RMPersistence to 0 in digi config prototype (03 Apr 2006)
 * extend V.21 HDLC frame reception timeout to 10 sec (03 Apr 2006)

diff --git a/faxd/Class1Send.c++ b/faxd/Class1Send.c++
index 9913ff7368876983bf50b25100d44064ab843c1b..a956f16dfae174dab0a8b8a2edda7351e21b313b 100644 (file)
--- a/faxd/Class1Send.c++
+++ b/faxd/Class1Send.c++
@@ -387,8 +387,8 @@ Class1Modem::sendPhaseB(TIFF* tif, Class2Params& next, FaxMachineInfo& info,
            }
        }
 
+       u_int ppr;
        do {
-           u_int ppr;
            if (signalRcvd == 0) {
                /*
                 * Send post-page message and get response.
@@ -523,7 +523,7 @@ Class1Modem::sendPhaseB(TIFF* tif, Class2Params& next, FaxMachineInfo& info,
                protoTrace(emsg);
                return (send_retry);
            }
-       } while (frame.getFCF() == FCF_CRP && ++ncrp < 3);
+       } while (ppr == FCF_CRP && ++ncrp < 3);
        if (ncrp == 3) {
            emsg = "Fax protocol error (command repeated 3 times)";
            protoTrace(emsg);