From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 16 May 2014 20:05:24 +0000 (+0000)
Subject: chan_dahdi: Fix analog dialtone detection.
X-Git-Tag: 12.3.0-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd321a97da36e2151eb2a90291bffdd4ae8c6073;p=thirdparty%2Fasterisk.git

chan_dahdi: Fix analog dialtone detection.

* Check if waitingfordt (waitfordialtone) is enabled in dahdi_read() to
allow the DSP to operate early enough to detect dialtone.

* Made use the correct variable in my_check_waitingfordt().

ASTERISK-23709 #close
Reported by: Steve Davies
Patches:
      dialtone_detect_fix (license #5012) patch uploaded by Steve Davies

Review: https://reviewboard.asterisk.org/r/3534/
........

Merged revisions 414067 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 414068 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@414069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index bd08dd4944..c1802309b2 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -1869,7 +1869,7 @@ static int my_check_waitingfordt(void *pvt)
 {
 	struct dahdi_pvt *p = pvt;
 
-	if (p->waitingfordt.tv_usec) {
+	if (p->waitingfordt.tv_sec) {
 		return 1;
 	}
 
@@ -8462,7 +8462,7 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast)
 #if 0
 	ast_debug(1, "Read %d of voice on %s\n", p->subs[idx].f.datalen, ast->name);
 #endif
-	if (p->dialing ||  p->radio || /* Transmitting something */
+	if ((p->dialing && !p->waitingfordt.tv_sec) ||  p->radio || /* Transmitting something */
 		(idx && (ast_channel_state(ast) != AST_STATE_UP)) || /* Three-way or callwait that isn't up */
 		((idx == SUB_CALLWAIT) && !p->subs[SUB_CALLWAIT].inthreeway) /* Inactive and non-confed call-wait */
 		) {