From e6a260c7472b6647b1c766b77fa97232616befdc Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Mon, 18 Feb 2008 15:47:00 +0000
Subject: [PATCH] Add an API call (ast_async_parseable_goto) which parses a
goto string and does an async goto instead of an explicit goto. (closes issue
#11753) Reported by: johan
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103765 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_channelredirect.c | 2 +-
include/asterisk/pbx.h | 5 +++++
main/pbx.c | 18 ++++++++++++++++--
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index d92840fce4..4629427243 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -72,7 +72,7 @@ static int asyncgoto_exec(struct ast_channel *chan, void *data)
return -1;
}
- res = ast_parseable_goto(chan2, args.label);
+ res = ast_async_parseable_goto(chan2, args.label);
ast_channel_unlock(chan2);
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index 1082c74b22..1ba9b0d709 100644
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -861,6 +861,11 @@ int ast_goto_if_exists(struct ast_channel *chan, const char *context, const char
*/
int ast_parseable_goto(struct ast_channel *chan, const char *goto_string);
+/*!
+ * \note This function will handle locking the channel as needed.
+ */
+int ast_async_parseable_goto(struct ast_channel *chan, const char *goto_string);
+
/*!
* \note This function will handle locking the channel as needed.
*/
diff --git a/main/pbx.c b/main/pbx.c
index e584ea07d8..e59ee9ea89 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7792,7 +7792,7 @@ int ast_async_goto_if_exists(struct ast_channel *chan, const char * context, con
return __ast_goto_if_exists(chan, context, exten, priority, 1);
}
-int ast_parseable_goto(struct ast_channel *chan, const char *goto_string)
+static int pbx_parseable_goto(struct ast_channel *chan, const char *goto_string, int async)
{
char *exten, *pri, *context;
char *stringp;
@@ -7836,8 +7836,22 @@ int ast_parseable_goto(struct ast_channel *chan, const char *goto_string)
if (mode)
ipri = chan->priority + (ipri * mode);
- ast_explicit_goto(chan, context, exten, ipri);
+ if (async)
+ ast_async_goto(chan, context, exten, ipri);
+ else
+ ast_explicit_goto(chan, context, exten, ipri);
+
ast_cdr_update(chan);
return 0;
}
+
+int ast_parseable_goto(struct ast_channel *chan, const char *goto_string)
+{
+ return pbx_parseable_goto(chan, goto_string, 0);
+}
+
+int ast_async_parseable_goto(struct ast_channel *chan, const char *goto_string)
+{
+ return pbx_parseable_goto(chan, goto_string, 1);
+}
--
GitLab