From: Joshua Colp Date: Fri, 13 Apr 2007 19:17:08 +0000 (+0000) Subject: Merged revisions 61655 via svnmerge from X-Git-Tag: 1.4.7.1~432 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03eb572457a0b36c2e988c7255bbcea219d48ef6;p=thirdparty%2Fasterisk.git Merged revisions 61655 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r61655 | file | 2007-04-13 15:15:12 -0400 (Fri, 13 Apr 2007) | 2 lines Add OUTBOUND_GROUP_ONCE variable to app_dial. This behaves the same as OUTBOUND_GROUP except it will get unset after use so it won't get accidentally inherited. (issue #BE-140) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61656 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_dial.c b/apps/app_dial.c index d253800f4d..cceec384bf 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -92,7 +92,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" @@ -1056,10 +1059,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 | OPT_IGNORE_FORWARDING); /* loop through the list of dial destinations */ rest = args.peers;