Recognize DTMF as caller id when waiting for rings

From Lee's work:
|  commit d158d795f56be80498f21b542789e85ffb8893f0
|  Author: Lee Howard <faxguy@howardsilvan.com>
|  Date:   Wed Jan 3 03:20:22 2007 +0000
|
|    Need to again recognize DTMF as a valid CallID indicator (for MT5634ZBA-DID).

diff --git a/CHANGES b/CHANGES
index af903f9c4b2f184762cf792fa092f4e4eecad55c..909d6079d509c5902ef030cccf4d5fcdbddf1e38 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog since HylaFAX 4.3.3
 
+* Recognize DTMF as caller id when waiting for rings (13 Mar 2007)
 * Use DLE+DTX to help reseting when stuck in transmit (13 Mar 2007)
 * Add DTMF handling during call (12 Mar 2007)
 * Logging instances where a sender transmits PPS again after our fourth PPR

diff --git a/faxd/ClassModem.c++ b/faxd/ClassModem.c++
index 2e9c740301a2cb07eff25cb3024ce9e563a05216..e4c42d6f3d7a2370d5b543581f62d143b3683a92 100644 (file)
--- a/faxd/ClassModem.c++
+++ b/faxd/ClassModem.c++
@@ -1305,6 +1305,7 @@ ClassModem::waitForRings(u_short rings, CallType& type, CallID& callid)
     time_t start = Sys::now();
     do {
        switch (atResponse(rbuf, conf.ringTimeout)) {
+       case AT_DTMF:
        case AT_OTHER:                  // check distinctive ring
            if (streq(conf.ringData, rbuf))
                type = CALLTYPE_DATA;