Bug 575: fix faxsend to retrain after receiving RTP

diff --git a/CHANGES b/CHANGES
index 7afe8d3ad67d5a33a9bb5239be4d50fef93aeeef..e89ac742eae950e53cec952d55f32548a89353b0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX 4.2.1
 
+* fix faxsend to retrain after receiving RTP (9 Sep 2004)
 * fix tiffcheck unit comparison error (1 Sep 2004)
 * fix misconfirmation of some ECM faxes (30 Aug 2004)
 * add fax batching support to faxq (30 Aug 2004)

diff --git a/faxd/Class1Send.c++ b/faxd/Class1Send.c++
index d64c9f521765dc5a858b0e912f2975c0fded7158..a7eacde9c280be2cdf81705b67f52e3ccaa6e1a1 100644 (file)
--- a/faxd/Class1Send.c++
+++ b/faxd/Class1Send.c++
@@ -401,16 +401,18 @@ Class1Modem::sendPhaseB(TIFF* tif, Class2Params& next, FaxMachineInfo& info,
                        protoTrace(emsg);
                        return (send_failed);
                    }
-                   /*
-                    * The session parameters cannot change except following
-                    * the reception of an RTN signal or the transmission of an
-                    * EOM signal.
-                    *
-                    * Since we did not receive RTN, and since batching (EOM)
-                    * triggers retraining in other ways, we require that the
-                    * next page have the same characteristics as this page.
-                    */
-                   next = params;
+                   if (ppr == FCF_MCF) {
+                       /*
+                        * The session parameters cannot change except following
+                        * the reception of an RTN or RTP signal or the transmission
+                        * of an EOM signal.
+                        *
+                        * Since we did not receive RTN or RTP, and since batching (EOM)
+                        * triggers retraining in other ways, we require that the
+                        * next page have the same characteristics as this page.
+                        */
+                       next = params;
+                   }
                }
                break;
            case FCF_DCN:               // disconnect, abort

diff --git a/faxd/Class2Send.c++ b/faxd/Class2Send.c++
index 2fdf129f944f44b8fad7f1c9ecefff7f030ad78b..d4446635f5b2402508546a2f179433739a35e414 100644 (file)
--- a/faxd/Class2Send.c++
+++ b/faxd/Class2Send.c++
@@ -302,16 +302,18 @@ Class2Modem::sendPhaseB(TIFF* tif, Class2Params& next, FaxMachineInfo& info,
                            emsg = "Problem reading document directory";
                            goto failed;
                        }
-                       /*
-                        * The session parameters cannot change except following
-                        * the reception of an RTN signal or the transmission of an
-                        * EOM signal.
-                        *
-                        * Since we did not receive RTN, and since batching (EOM)
-                        * triggers retraining in other ways, we require that the
-                        * next page have the same characteristics as this page.
-                        */
-                       next = params;
+                       if (ppr == FCF_MCF) {
+                           /*
+                            * The session parameters cannot change except following
+                            * the reception of an RTN or RTP signal or the transmission
+                            * of an EOM signal.
+                            *
+                            * Since we did not receive RTN or RTP, and since batching (EOM)
+                            * triggers retraining in other ways, we require that the
+                            * next page have the same characteristics as this page.
+                            */
+                           next = params;
+                       }
                    }
                    transferOK = true;
                    break;