Don't bother having the core pass through or emulate begin DTMF frames when in an...

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

diff --git a/main/file.c b/main/file.c
index 39b4b42129b8848f827194ac41a52bc9f235fb44..6bb0551a3c48f2d73ace5211a9754912e60cbb92 100644 (file)
--- a/main/file.c
+++ b/main/file.c
@@ -1003,6 +1003,9 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                forward = "";
        if (!rewind)
                rewind = "";
+
+       /* Switch the channel to end DTMF frame only. waitstream_core doesn't care about the start of DTMF. */
+       ast_set_flag(c, AST_FLAG_END_DTMF_ONLY);
        
        while (c->stream) {
                int res;
@@ -1017,6 +1020,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                        res = ast_waitfor(c, ms);
                        if (res < 0) {
                                ast_log(LOG_WARNING, "Select failed (%s)\n", strerror(errno));
+                               ast_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
                                return res;
                        }
                } else {
@@ -1027,9 +1031,11 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                                if (errno == EINTR)
                                        continue;
                                ast_log(LOG_WARNING, "Wait failed (%s)\n", strerror(errno));
+                               ast_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
                                return -1;
                        } else if (outfd > -1) { /* this requires cmdfd set */
                                /* The FD we were watching has something waiting */
+                               ast_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
                                return 1;
                        }
                        /* if rchan is set, it is 'c' */
@@ -1037,8 +1043,10 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                }
                if (res > 0) {
                        struct ast_frame *fr = ast_read(c);
-                       if (!fr)
+                       if (!fr) {
+                               ast_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
                                return -1;
+                       }
                        switch(fr->frametype) {
                        case AST_FRAME_DTMF_END:
                                if (context) {
@@ -1046,6 +1054,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                                        if (ast_exists_extension(c, context, exten, 1, c->cid.cid_num)) {
                                                res = fr->subclass;
                                                ast_frfree(fr);
+                                               ast_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
                                                return res;
                                        }
                                } else {
@@ -1056,6 +1065,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                                                ast_stream_rewind(c->stream, skip_ms);
                                        } else if (strchr(breakon, res)) {
                                                ast_frfree(fr);
+                                               ast_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
                                                return res;
                                        }                                       
                                }
@@ -1066,6 +1076,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                                case AST_CONTROL_BUSY:
                                case AST_CONTROL_CONGESTION:
                                        ast_frfree(fr);
+                                       ast_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
                                        return -1;
                                case AST_CONTROL_RINGING:
                                case AST_CONTROL_ANSWER:
@@ -1090,6 +1101,9 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                }
                ast_sched_runq(c->sched);
        }
+
+       ast_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
+
        return (c->_softhangup ? -1 : 0);
 }