summaryrefslogtreecommitdiff
path: root/apps/app_queue.c
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2012-03-22 21:25:22 +0000
committerJonathan Rose <jrose@digium.com>2012-03-22 21:25:22 +0000
commitc6979ff581f9f15ce96b3052863d0ac35f4cd387 (patch)
treebf7edd778a85a1587a1e17c6a34e03d46df7d478 /apps/app_queue.c
parentc5b3db1956a3db2446b0310b3a7d59961fe3e089 (diff)
Adds F option to Bridge application
Similar to dial and queue F option. (Closes issue ASTERISK-19282) Reported by: To Patches: bridge_f-v3.diff uploaded by To (license 6347) Review: https://reviewboard.asterisk.org/r/1825/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360227 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_queue.c')
-rw-r--r--apps/app_queue.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index d372a50ba..7a91384b8 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1305,21 +1305,6 @@ static void set_queue_result(struct ast_channel *chan, enum queue_result res)
}
}
-/*!
- * \internal
- * \brief Converts delimited '^' characters in a target priority/extension/context string
- * to commas so that they can be used with ast_parseable_goto.
- * \param s string that '^' characters are being replaced in.
- */
-static void replace_macro_delimiter(char *s)
-{
- for (; *s; s++) {
- if (*s == '^') {
- *s = ',';
- }
- }
-}
-
static const char *int2strat(int strategy)
{
int x;
@@ -5326,7 +5311,7 @@ static int try_calling(struct queue_ent *qe, const struct ast_flags opts, char *
if (!ast_check_hangup(peer) && ast_test_flag(&opts, OPT_CALLEE_GO_ON)) {
if (!ast_strlen_zero(opt_args[OPT_ARG_CALLEE_GO_ON])) {
- replace_macro_delimiter(opt_args[OPT_ARG_CALLEE_GO_ON]);
+ ast_replace_subargument_delimiter(opt_args[OPT_ARG_CALLEE_GO_ON]);
if (ast_parseable_goto(peer, opt_args[OPT_ARG_CALLEE_GO_ON]) == AST_PBX_SUCCESS) {
ast_pbx_start(peer);