Bug 77: fix EOM reception in V.34

diff --git a/faxd/Class1.c++ b/faxd/Class1.c++
index e4518e113d2a767c6fc54de456ba8286ed0dbf70..d1edeb0925398623f74ce75da0f0fa558d1b200e 100644 (file)
--- a/faxd/Class1.c++
+++ b/faxd/Class1.c++
@@ -101,6 +101,7 @@ Class1Modem::Class1Modem(FaxServer& s, const ModemConfig& c)
     fxAssert(ecmFrame != NULL, "ECM procedure error (block).");
     ecmStuffedBlock = (u_char*) malloc(fs == 256 ? 83000 : 33000);
     fxAssert(ecmFrame != NULL, "ECM procedure error (stuffed block).");
+    gotCTRL = false;
 }
 
 Class1Modem::~Class1Modem()

diff --git a/faxd/Class1Recv.c++ b/faxd/Class1Recv.c++
index fe34c8577afde73a8fc93a3153740f10268c289a..7d67aa9f2acdd42c97fa3d1d227241332ccee72b 100644 (file)
--- a/faxd/Class1Recv.c++
+++ b/faxd/Class1Recv.c++
@@ -95,7 +95,7 @@ Class1Modem::recvBegin(fxStr& emsg)
     fxStr nsf;
     encodeNSF(nsf, HYLAFAX_VERSION);
 
-    if (useV34) waitForDCEChannel(true);       // expect control channel
+    if (useV34 && !gotCTRL) waitForDCEChannel(true);   // expect control channel
 
     return FaxModem::recvBegin(emsg) && recvIdentification(
        0, fxStr::null,