diff options
| author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-21 14:23:55 +0000 |
|---|---|---|
| committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-21 14:23:55 +0000 |
| commit | 8911e9f7c38901c3495b409f62b8f99b29837c9e (patch) | |
| tree | 3760e55660ea8f9484cce43c8868ffd189fc3629 /apps | |
| parent | 834fc211a9273c0bd1f2694b63243161f53cedcc (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@61752 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 16 | ||||
| -rw-r--r-- | apps/app_queue.c | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index d900a14d2..b04b33435 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -90,7 +90,10 @@ static char *descrip = "ends the call.\n" " The optional URL will be sent to the called party if the channel supports it.\n" " If the OUTBOUND_GROUP variable is set, all peer channels created by this\n" -"application will be put into that group (as in Set(GROUP()=...).\n\n" +"application will be put into that group (as in Set(GROUP()=...).\n" +" If the OUTBOUND_GROUP_ONCE variable is set, all peer channels created by this\n" +"application will be put into that group (as in Set(GROUP()=...). Unlike OUTBOUND_GROUP,\n" +"however, the variable will be unset after use.\n\n" " Options:\n" " A(x) - Play an announcement to the called party, using 'x' as the file.\n" " C - Reset the CDR for this call.\n" @@ -1009,10 +1012,15 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags if (continue_exec) *continue_exec = 0; - + /* If a channel group has been specified, get it for use when we create peer channels */ - outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP"); - + if ((outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP_ONCE"))) { + outbound_group = ast_strdupa(outbound_group); + pbx_builtin_setvar_helper(chan, "OUTBOUND_GROUP_ONCE", NULL); + } else { + outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP"); + } + ast_copy_flags(peerflags, &opts, OPT_DTMF_EXIT | OPT_GO_ON | OPT_ORIGINAL_CLID | OPT_CALLER_HANGUP); cur = args.peers; do { diff --git a/apps/app_queue.c b/apps/app_queue.c index b6d809862..712619256 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1990,7 +1990,7 @@ static struct localuser *wait_for_answer(struct queue_ent *qe, struct localuser ast_frfree(f); return NULL; } - if ((f->frametype == AST_FRAME_DTMF) && (f->subclass != '*') && valid_exit(qe, f->subclass)) { + if ((f->frametype == AST_FRAME_DTMF) && valid_exit(qe, f->subclass)) { if (option_verbose > 3) ast_verbose(VERBOSE_PREFIX_3 "User pressed digit: %c\n", f->subclass); *to=0; |