Merged revisions 185772 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r185772 | russell | 2009-04-01 08:48:26 -0500 (Wed, 01 Apr 2009) | 14 lines

Merged revisions 185771 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r185771 | russell | 2009-04-01 08:47:30 -0500 (Wed, 01 Apr 2009) | 6 lines

Fix a case where DTMF could bypass audiohooks.

This change fixes a situation where an audiohook that wants DTMF would not
actually get it.  This is in the code path where we end DTMF digit length
emulation while handling a NULL frame.

........

................

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

diff --git a/main/channel.c b/main/channel.c
index 4b056766c2adcaa7fca62bb7610df177fe331c0a..af5fe052f38564b94ff50c2048e3254e9c7b6eb3 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -2801,6 +2801,13 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
                                        ast_clear_flag(chan, AST_FLAG_EMULATE_DTMF);
                                        chan->emulate_dtmf_digit = 0;
                                        ast_log(LOG_DTMF, "DTMF end emulation of '%c' queued on %s\n", f->subclass, chan->name);
+                                       if (chan->audiohooks) {
+                                               struct ast_frame *old_frame = f;
+                                               f = ast_audiohook_write_list(chan, chan->audiohooks, AST_AUDIOHOOK_DIRECTION_READ, f);
+                                               if (old_frame != f) {
+                                                       ast_frfree(old_frame);
+                                               }
+                                       }
                                }
                        }
                        break;