Bug 638: increase timeout from 3.9 to 4.1 seconds for

         Class1RMPersistence: 0 settings.

diff --git a/faxd/Class1Recv.c++ b/faxd/Class1Recv.c++
index eb8bede8618cf2cc2eb070765e231f642e8c29ba..e06b609245e62d470e80f38feead6617a52f741a 100644 (file)
--- a/faxd/Class1Recv.c++
+++ b/faxd/Class1Recv.c++
@@ -525,7 +525,7 @@ Class1Modem::recvPage(TIFF* tif, u_int& ppm, fxStr& emsg, const fxStr& id)
                u_short attempts = 0;
                do {
                    (void) atCmd(rmCmd, AT_NOTHING);
-                   rmResponse = atResponse(rbuf, conf.class1RMPersistence ? conf.t2Timer : conf.t2Timer - conf.t4Timer);
+                   rmResponse = atResponse(rbuf, conf.class1RMPersistence ? conf.t2Timer : conf.t2Timer - 2900);
                } while ((rmResponse == AT_NOTHING || rmResponse == AT_FCERROR) && ++attempts < conf.class1RMPersistence);
                if (rmResponse == AT_CONNECT) {
                    /*
@@ -897,7 +897,7 @@ Class1Modem::raiseRecvCarrier(bool& dolongtrain, fxStr& emsg)
     lastResponse = AT_NOTHING;
     do {
        (void) atCmd(rmCmd, AT_NOTHING);
-       lastResponse = atResponse(rbuf, conf.class1RMPersistence ? conf.t2Timer : conf.t2Timer - conf.t4Timer);
+       lastResponse = atResponse(rbuf, conf.class1RMPersistence ? conf.t2Timer : conf.t2Timer - 2900);
     } while ((lastResponse == AT_NOTHING || lastResponse == AT_FCERROR) && ++attempts < conf.class1RMPersistence);
     if (lastResponse == AT_ERROR) gotEOT = true;       // on hook
     if (lastResponse == AT_FRH3 && waitFor(AT_CONNECT,0)) {