diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-09 16:12:57 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-09 16:12:57 +0000 |
commit | ebf7b219107a38226134091e54570572b62001f2 (patch) | |
tree | 1500f0dc2fd6bb4755baf09fe9ccf544c8f91890 /apps/app_meetme.c | |
parent | 201f0212722f2be8a9b3b68455219139087318fe (diff) |
Fix a problem with the combination of the 'F' option to pass DTMF through a
conference and options that use DTMF to activate various features. The problem
was that the BEGIN frame would be passed through, but the END frame would get
intercepted to activate a feature. Then, the other conference members would hear
DTMF for forever, which they didn't seem to like very much.
(closes issue #10400, reported by stevefeinstein, fixed by me)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@78717 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r-- | apps/app_meetme.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 7e05b917d..ea5b5eea2 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -228,8 +228,7 @@ static const char *descrip = " 'D' -- dynamically add conference, prompting for a PIN\n" " 'e' -- select an empty conference\n" " 'E' -- select an empty pinless conference\n" -" 'F' -- Pass DTMF through the conference. DTMF used to activate any\n" -" conference features will not be passed through.\n" +" 'F' -- Pass DTMF through the conference.\n" " 'i' -- announce user join/leave with review\n" " 'I' -- announce user join/leave without review\n" " 'l' -- set listen only mode (Listen only, no talking)\n" @@ -1960,6 +1959,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } else if ((f->frametype == AST_FRAME_DTMF) && (confflags & CONFFLAG_EXIT_CONTEXT)) { char tmp[2]; + if (confflags & CONFFLAG_PASS_DTMF) + conf_queue_dtmf(conf, user, f); + tmp[0] = f->subclass; tmp[1] = '\0'; if (!ast_goto_if_exists(chan, exitcontext, tmp, 1)) { @@ -1970,10 +1972,14 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } else if (option_debug > 1) ast_log(LOG_DEBUG, "Exit by single digit did not work in meetme. Extension %s does not exist in context %s\n", tmp, exitcontext); } else if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#') && (confflags & CONFFLAG_POUNDEXIT)) { + if (confflags & CONFFLAG_PASS_DTMF) + conf_queue_dtmf(conf, user, f); ret = 0; ast_frfree(f); break; } else if (((f->frametype == AST_FRAME_DTMF) && (f->subclass == '*') && (confflags & CONFFLAG_STARMENU)) || ((f->frametype == AST_FRAME_DTMF) && menu_active)) { + if (confflags & CONFFLAG_PASS_DTMF) + conf_queue_dtmf(conf, user, f); if (ioctl(fd, ZT_SETCONF, &ztc_empty)) { ast_log(LOG_WARNING, "Error setting conference\n"); close(fd); |