[svn-commits] rmudgett: branch 1.4 r298193 - /branches/1.4/channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Dec 13 10:56:07 2010
New Revision: 298193

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298193
Log:
Outgoing PRI/BRI calls cannot do DTMF triggered transfers.

Outgoing PRI/BRI calls cannot do DTMF triggered transfers if a PROCEEDING
message is not received.  The debug output shows that the DTMF begin event
is seen, but the DTMF end event is missing.  When the DTMF begin happens,
the call is muted so we now have one way audio (until a DTMF end event is
somehow seen).

* Made set the proceeding flag when the PRI_EVENT_ANSWER event is
received.

* Made absorb the DTMF begin and DTMF end events if we are overlap dialing
and have not seen a PROCEEDING message.

* Added a debug message when absorbing a DTMF event.

JIRA SWP-2690
JIRA ABE-2697

Modified:
    branches/1.4/channels/chan_dahdi.c

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=298193&r1=298192&r2=298193
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Mon Dec 13 10:56:07 2010
@@ -5626,12 +5626,18 @@
 					   a busy  */
 					f = NULL;
 				}
-			} else if (f->frametype == AST_FRAME_DTMF) {
+			} else if (f->frametype == AST_FRAME_DTMF_BEGIN
+				|| f->frametype == AST_FRAME_DTMF_END) {
 #ifdef HAVE_PRI
 				if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial &&
 					((!p->outgoing && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) ||
 					(p->outgoing && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)))) {
 					/* Don't accept in-band DTMF when in overlap dial mode */
+					ast_log(LOG_DEBUG,
+						"Absorbing inband %s DTMF digit: 0x%02X '%c' on %s\n",
+						f->frametype == AST_FRAME_DTMF_BEGIN ? "begin" : "end",
+						f->subclass, f->subclass, ast->name);
+
 					f->frametype = AST_FRAME_NULL;
 					f->subclass = 0;
 				}
@@ -10100,6 +10106,7 @@
 							ast_log(LOG_DEBUG, "Waiting on answer confirmation on channel %d!\n", pri->pvts[chanpos]->channel);
 						} else {
 							pri->pvts[chanpos]->dialing = 0;
+							pri->pvts[chanpos]->proceeding = 1;
 							pri->pvts[chanpos]->subs[SUB_REAL].needanswer =1;
 							/* Enable echo cancellation if it's not on already */
 							dahdi_enable_ec(pri->pvts[chanpos]);