diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-11-28 00:24:19 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-11-28 00:24:19 +0000 |
| commit | 880fb1ece980e7adc228407758bf5a3553da1dd1 (patch) | |
| tree | 90868de3d406229ff22e00228afa6221f33a3c57 /main/pbx.c | |
| parent | 1dc9fa52316a02a4e83b7123bb90898f16d50b72 (diff) | |
Merged revisions 89893 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@89915 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |