diff options
| -rw-r--r-- | include/asterisk/pbx.h | 21 | ||||
| -rw-r--r-- | main/pbx.c | 4 |
2 files changed, 24 insertions, 1 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index bc1155b8a..3568e7ec4 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -846,10 +846,29 @@ int pbx_set_autofallthrough(int newval); set to 1, sets to use the new Trie-based pattern matcher. If newval set to 0, sets to use the old linear-search algorithm. Returns previous value. */ int pbx_set_extenpatternmatchnew(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 857b7e218..e3498c5ad 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5719,6 +5719,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)) @@ -5730,6 +5732,8 @@ int ast_explicit_goto(struct ast_channel *chan, const char *context, const char chan->priority--; } + ast_channel_unlock(chan); + return 0; } |