[svn-commits] mmichelson: trunk r81121 - in /trunk: ./ channels/chan_agent.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Aug 27 16:09:37 2007
New Revision: 81121

URL: http://svn.digium.com/view/asterisk?view=rev&rev=81121
Log:
Merged revisions 81120 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81120 | mmichelson | 2007-08-27 16:08:48 -0500 (Mon, 27 Aug 2007) | 7 lines

DTMF begin frames should be ignored so that when an agent acks a call with the '#' key,
he doesn't cause a queue's announce file to be interrupted. Also went ahead and did the
same for the '*' key and for ending a call.

(closes issue #10528, reported by deskhack, patched by me)


........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_agent.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_agent.c?view=diff&rev=81121&r1=81120&r2=81121
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Mon Aug 27 16:09:37 2007
@@ -472,6 +472,12 @@
  			}
  			break;
 		case AST_FRAME_DTMF_BEGIN:
+			/*ignore DTMF begin's as it can cause issues with queue announce files*/
+			if((!p->acknowledged && f->subclass == '#') || (f->subclass == '*' && endcall)){
+				ast_frfree(f);
+				f = &ast_null_frame;
+			}
+			break;
  		case AST_FRAME_DTMF_END:
  			if (!p->acknowledged && (f->subclass == '#')) {
  				ast_verb(3, "%s acknowledged\n", p->chan->name);