aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-28 00:20:13 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-28 00:20:13 +0000
commitae76caf40eb8c72c297c0ed3d1f83001bcfaf799 (patch)
tree992b2950abc245eb33a35abdc216ac44a38d4687
parent286f581f4e8e0d1493f7551a35b47ce935675fa6 (diff)
- update documentation for some of the goto functions to note that they
handle locking the channel as needed - update ast_explicit_goto() to lock the channel as needed git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@89893 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--include/asterisk/pbx.h21
-rw-r--r--main/pbx.c4
2 files changed, 24 insertions, 1 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index 699aa5082..1e8bf56d6 100644
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -804,10 +804,29 @@ int ast_extension_patmatch(const char *pattern, const char *data);
set to 1, sets to auto fall through. If newval set to 0, sets to no auto
fall through (reads extension instead). Returns previous value. */
int pbx_set_autofallthrough(int newval);
+
+/*!
+ * \note This function will handle locking the channel as needed.
+ */
int ast_goto_if_exists(struct ast_channel *chan, const char *context, const char *exten, int priority);
-/* I can find neither parsable nor parseable at dictionary.com, but google gives me 169000 hits for parseable and only 49,800 for parsable */
+
+/*!
+ * \note I can find neither parsable nor parseable at dictionary.com,
+ * but google gives me 169000 hits for parseable and only 49,800
+ * for parsable
+ *
+ * \note This function will handle locking the channel as needed.
+ */
int ast_parseable_goto(struct ast_channel *chan, const char *goto_string);
+
+/*!
+ * \note This function will handle locking the channel as needed.
+ */
int ast_explicit_goto(struct ast_channel *chan, const char *context, const char *exten, int priority);
+
+/*!
+ * \note This function will handle locking the channel as needed.
+ */
int ast_async_goto_if_exists(struct ast_channel *chan, const char *context, const char *exten, int priority);
struct ast_custom_function* ast_custom_function_find(const char *name);
diff --git a/main/pbx.c b/main/pbx.c
index 025bcef21..fc3ccb15e 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4581,6 +4581,8 @@ int ast_explicit_goto(struct ast_channel *chan, const char *context, const char
if (!chan)
return -1;
+ ast_channel_lock(chan);
+
if (!ast_strlen_zero(context))
ast_copy_string(chan->context, context, sizeof(chan->context));
if (!ast_strlen_zero(exten))
@@ -4592,6 +4594,8 @@ int ast_explicit_goto(struct ast_channel *chan, const char *context, const char
chan->priority--;
}
+ ast_channel_unlock(chan);
+
return 0;
}