Merged revisions 77460 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 26 Jul 2007 23:20:25 +0000 (23:20 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 26 Jul 2007 23:20:25 +0000 (23:20 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77460 | file | 2007-07-26 20:19:04 -0300 (Thu, 26 Jul 2007) | 4 lines

(closes issue #10302)
Reported by: litnialex
If a DTMF end frame comes from a channel without a begin and it is going to a technology that only accepts end frames (aka INFO) then use the minimum DTMF duration if one is not in the frame already.

........

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

main/channel.c

index bc47e0a..c1b3b88 100644 (file)
@@ -2302,9 +2302,12 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
                                }
                        } else {
                                struct timeval now = ast_tvnow();
-                               ast_clear_flag(chan, AST_FLAG_IN_DTMF);
-                               if (!f->len)
-                                       f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
+                               if (ast_test_flag(chan, AST_FLAG_IN_DTMF)) {
+                                       ast_clear_flag(chan, AST_FLAG_IN_DTMF);
+                                       if (!f->len)
+                                               f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
+                               } else if (!f->len)
+                                       f->len = AST_MIN_DTMF_DURATION;
                                if (f->len < AST_MIN_DTMF_DURATION) {
                                        ast_set_flag(chan, AST_FLAG_EMULATE_DTMF);
                                        chan->emulate_dtmf_digit = f->subclass;