Modems: Handle DLE+ETX noise after dialing

From the series by Lee:
| commit 30742665c14c9e5992394f7d1b8c6e65aeb46740
| Author: Lee Howard <faxguy@howardsilvan.com>
| Date:   Thu Aug 9 16:54:16 2007 +0000
|
|   DLE+ETX after dialing is just noise, ignore it

| commit c383d8eb926bfa6949983f5712a41269a1173e05
| Author: Lee Howard <faxguy@howardsilvan.com>
| Date:   Sat Aug 11 22:19:04 2007 +0000
|
|   DLE+ETX is detected not as AT_OTHER, but as AT_DLEETX

| commit 71dbd51f0a1a0d88392169210998670e5f665cc3
| Author: Lee Howard <faxguy@howardsilvan.com>
| Date:   Tue Aug 21 20:17:39 2007 +0000
|
|   Carol Almquist points finishes off the DLE+ETX-after-ATDT adjustments.

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4044695a7ea4f51dedb42d6c0758d17ab24dd9cd..5c350c577770f176abfab3155fab878e6539f3cd 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -11,6 +11,7 @@ for his help in making a working Class 1 driver.
   Alvaro Aguilera
   Andre Albsmeier
   Bruno Almeida do Lago
+  Carol Almquist
   Matthias Apitz
   Ronald Appelfelder
   Heinz-Ado Arnolds

diff --git a/faxd/Class1Send.c++ b/faxd/Class1Send.c++
index 815fe747c969309dff3fe60a756720ae536adfa3..17eab047a9d61fa33732655cd4b1d906f50fb06d 100644 (file)
--- a/faxd/Class1Send.c++
+++ b/faxd/Class1Send.c++
@@ -100,11 +100,13 @@ Class1Modem::dialResponse(Status& eresult)
             * accept three of these in case the modem switches carriers
             * several times (haven't yet encountered anyone that does).
             */
+       case AT_DLEETX:                         // silly modem
            if (++ntrys == 3) {
                eresult = Status(11, "Ringback detected, no answer without CED"); // XXX
                protoTrace(eresult.string());
                return (NOFCON);
            }
+           r = AT_OTHER;
            break;
        }
     } while (r == AT_OTHER && isNoise(rbuf));

diff --git a/faxd/ClassModem.c++ b/faxd/ClassModem.c++
index 3772bb497fa1ecea2d76728ff0deb7f602a0bdd3..540de9748b34ca401eadb7f61f717a1b91a1da3f 100644 (file)
--- a/faxd/ClassModem.c++
+++ b/faxd/ClassModem.c++
@@ -157,6 +157,7 @@ ClassModem::isNoise(const char* s)
        "+F34:",        // Class 1.0 V.34 report
        "+FDB:",        // DCE debugging
        "MESSAGE-WAITING",      // voice-mail waiting, Conexant
+       "\020\003",     // DLE+ETX ???
     };
 #define        NNOISE  (sizeof (noiseMsgs) / sizeof (noiseMsgs[0]))