]> git.ipfire.org Git - thirdparty/HylaFAX.git/commitdiff
Remove timeout setting after we timeout and abortReceive
authorAidan Van Dyk <aidan@ifax.com>
Wed, 14 Mar 2007 18:28:55 +0000 (18:28 +0000)
committerAidan Van Dyk <aidan@ifax.com>
Wed, 14 Mar 2007 18:28:55 +0000 (18:28 +0000)
From Lee's work:
|  commit 209f80ecfd684cc4b30a7007219aacf124e4755f
|  Author: Lee Howard <faxguy@howardsilvan.com>
|  Date:   Tue Aug 15 16:23:34 2006 +0000
|
|    after a timeout and we abortReceive we need to remove the timeout true setting

faxd/Class1.c++

index 4a4506b4c262f82f2cda2c4668fe69e4aa1b96ab..e9cdb585a1aba510d91c45cf1d84489c4c636c9b 100644 (file)
@@ -1409,7 +1409,10 @@ Class1Modem::recvFrame(HDLCFrame& frame, u_char dir, long ms, bool readPending,
                startTimeout(ms);
                if (!(atCmd(rhCmd, AT_NOTHING, 0) && waitFor(AT_CONNECT,0))) {
                    stopTimeout("waiting for v.21 carrier");
-                   if (wasTimeout()) abortReceive();
+                   if (wasTimeout()) {
+                       abortReceive();
+                       setTimeout(false);
+                   }
                    return (false);
                }
                stopTimeout("waiting for v.21 carrier");
@@ -1424,7 +1427,10 @@ Class1Modem::recvFrame(HDLCFrame& frame, u_char dir, long ms, bool readPending,
        if (lastResponse == AT_ERROR) gotEOT = true;            // on hook
     }
     stopTimeout("waiting for v.21 carrier");
-    if (wasTimeout()) abortReceive();
+    if (wasTimeout()) {
+       abortReceive();
+       setTimeout(false);
+    }
     return (false);
 }