dect/asterisk
Archived
14
0
Fork 0
Code Releases Activity

Merged revisions 89893 via svnmerge from

Browse source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89893 | russell | 2007-11-27 18:20:13 -0600 (Tue, 27 Nov 2007) | 4 lines

 - 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/trunk@89915 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2007-11-28 00:24:19 +00:00
parent 25a29b29a6
commit 78bd1dcd5f
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/asterisk/pbx.h
View file

@ -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);

4
main/pbx.c
View file

@ -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;
}