[svn-commits] rmudgett: branch 1.8 r414067 - /branches/1.8/channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri May 16 15:00:55 2014
New Revision: 414067

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=414067
Log:
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/

Modified:
    branches/1.8/channels/chan_dahdi.c

Modified: branches/1.8/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_dahdi.c?view=diff&rev=414067&r1=414066&r2=414067
==============================================================================
--- branches/1.8/channels/chan_dahdi.c (original)
+++ branches/1.8/channels/chan_dahdi.c Fri May 16 15:00:55 2014
@@ -2355,7 +2355,7 @@
 {
 	struct dahdi_pvt *p = pvt;
 
-	if (p->waitingfordt.tv_usec) {
+	if (p->waitingfordt.tv_sec) {
 		return 1;
 	}
 
@@ -9246,7 +9246,7 @@
 #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->_state != 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 */
 		) {